rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.5, 1.6 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.2, 1.3 openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.1, 1.2
Caolan McNamara
caolanm at fedoraproject.org
Fri Feb 13 12:15:19 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13883
Modified Files:
openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
Log Message:
butcher a few patches
openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch:
Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 12 Feb 2009 14:25:02 -0000 1.5
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 13 Feb 2009 12:15:19 -0000 1.6
@@ -119,32 +119,23 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "MasterPageContainer.hxx"
-@@ -328,6 +329,13 @@
- }
-
+@@ -251,11 +252,14 @@
+ {
+ // Disable the SID_DELTE_MASTER slot when there is only one master page.
+ if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0)
+- {
+ rItemSet.DisableItem(SID_DELETE_MASTER_PAGE);
+- }
-+void CurrentMasterPagesSelector::GetState (SfxItemSet& rItemSet)
-+{
-+ MasterPagesSelector::GetState (rItemSet);
+ MasterPagesSelector::GetState(rItemSet);
++
+ DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mrBase.GetMainViewShell().get());
+ if (pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+ rItemSet.DisableItem (SID_TP_EDIT_MASTER);
-+}
-
-
- } } } // end of namespace ::sd::toolpanel::controls
-diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx
---- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx 2008-02-05 17:05:15.000000000 +0000
-+++ openoffice.org/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx 2008-02-06 14:20:20.000000000 +0000
-@@ -72,6 +72,8 @@
- */
- virtual void Fill (ItemList& rItemList);
-
-+ virtual void GetState (SfxItemSet& rItemSet);
+
- using sd::toolpanel::controls::MasterPagesSelector::Fill;
+ }
+
- protected:
diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx 2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx 2008-02-06 16:28:52.000000000 +0000
openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch:
Index: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 12 Feb 2009 14:25:02 -0000 1.2
+++ openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 13 Feb 2009 12:15:19 -0000 1.3
@@ -5,7 +5,34 @@
diff -u -r1.113.44.3 ww8atr.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8atr.cxx 12 Dec 2008 11:12:04 -0000 1.113.44.3
+++ openoffice.org/sw/source/filter/ww8/ww8atr.cxx 5 Jan 2009 10:47:18 -0000
-@@ -2141,76 +2141,73 @@
+@@ -781,11 +781,8 @@
+ {
+ if (const SwFmt *pParent = rFmt.DerivedFrom())
+ {
+- //BYTE nLvl = ((const SwTxtFmtColl*)pParent)->GetOutlineLevel(); //#outline level,removed by zhaojianwei
+- //if (MAXLEVEL > nLvl)
+- //{ //<-end, ->add by zhaojianwei
+ if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle())
+- { //<-end,zhaojianwei
++ {
+ if (bWrtWW8)
+ {
+ SwWW8Writer::InsUInt16(*pO, 0x2640);
+@@ -817,12 +814,9 @@
+ case RES_TXTFMTCOLL:
+ if( bPapFmt )
+ {
+- //BYTE nLvl = ((const SwTxtFmtColl&)rFmt).GetOutlineLevel(); //#outline level,removed by zhaojianwei
+- //if (MAXLEVEL > nLvl)
+- //{ //<-end, ->add by zhaojianwei
+ if (((const SwTxtFmtColl&)rFmt).IsAssignedToListLevelOfOutlineStyle())
+ {
+- int nLvl = ((const SwTxtFmtColl&)rFmt).GetAssignedOutlineStyleLevel(); //<-end,zhaojianwei
++ int nLvl = ((const SwTxtFmtColl&)rFmt).GetAssignedOutlineStyleLevel();
+
+ //if outline numbered
+ // if Write StyleDefinition then write the OutlineRule
+@@ -2141,76 +2135,76 @@
if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
{
@@ -35,7 +62,7 @@
+ // styles 1-9 and find the lowest valid outline level
+ BYTE nPosOfLowestNonStandardLvl = MAXLEVEL;
const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
- const SwTxtFmtColl* pColl;
+- const SwTxtFmtColl* pColl;
for( n = rColls.Count(); n; )
{
- pColl = rColls[ --n ];
@@ -43,16 +70,18 @@
- //USHORT nPoolId = pColl->GetPoolFmtId();
- //if( MAXLEVEL > nLvl && nMinLvl < nLvl && //<-end, ->add by zhaojianwei
+ const SwTxtFmtColl* pColl = rColls[ --n ];
-+ BYTE nTestLvl = pColl->GetOutlineLevel();
USHORT nPoolId = pColl->GetPoolFmtId();
- if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
- nMinLvl < (nLvl = pColl->GetAssignedOutlineStyleLevel()) && //<-end,zhaojianwei
- ( RES_POOLCOLL_HEADLINE1 > nPoolId ||
- RES_POOLCOLL_HEADLINE9 < nPoolId ))
+ if (
-+ (RES_POOLCOLL_HEADLINE1 > nPoolId || RES_POOLCOLL_HEADLINE9 < nPoolId) && //Is a Non-Standard Outline Style
-+ (nTestLvl < MAXLEVEL) && //Has a valid outline level
-+ (nTestLvl < nPosOfLowestNonStandardLvl) // Is less than the lowest known non-standard level
++ //Is a Non-Standard Outline Style
++ (RES_POOLCOLL_HEADLINE1 > nPoolId || RES_POOLCOLL_HEADLINE9 < nPoolId) &&
++ //Has a valid outline level
++ (pColl->IsAssignedToListLevelOfOutlineStyle()) &&
++ // Is less than the lowest known non-standard level
++ (pColl->GetAssignedOutlineStyleLevel() < nPosOfLowestNonStandardLvl)
+ )
{
- // If we are using the default heading styles then use nTOXLvl
@@ -61,7 +90,7 @@
- else
- nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
- nMinLvl = nLvl;
-+ nPosOfLowestNonStandardLvl = nTestLvl;
++ nPosOfLowestNonStandardLvl = pColl->GetAssignedOutlineStyleLevel();
}
}
@@ -121,7 +150,9 @@
- (( sTOption += pColl->GetName() ) += ';' )
- += String::CreateFromInt32( nLvl + 1 );
+ const SwTxtFmtColl* pColl = rColls[ --n ];
-+ BYTE nTestLvl = pColl->GetOutlineLevel();
++ if (!pColl->IsAssignedToListLevelOfOutlineStyle())
++ continue;
++ BYTE nTestLvl = pColl->GetAssignedOutlineStyleLevel();
+ if (nTestLvl < nTOXLvl && nTestLvl >= nMaxMSAutoEvaluate)
+ {
+ if( sTOption.Len() )
@@ -131,7 +162,7 @@
}
}
}
-@@ -2223,16 +2220,21 @@
+@@ -2223,16 +2217,20 @@
if( rStyles.Len() )
{
xub_StrLen nPos = 0;
@@ -147,8 +178,7 @@
- sTOption += ';';
- ( sTOption += sStyle ) += sLvl;
+ SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(sStyle);
-+ BYTE nTestLvl = pColl ? pColl->GetOutlineLevel() : 0;
-+ if ((nTestLvl < nTOXLvl) || (nTestLvl == NO_NUMBERING) || (nTestLvl == NO_NUM))
++ if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
+ {
+ if( sTOption.Len() )
+ sTOption += ',';
@@ -157,6 +187,18 @@
}
} while( STRING_NOTFOUND != nPos );
}
+@@ -3332,10 +3330,8 @@
+ else if( rWW8Wrt.pOutFmtNode->ISA( SwTxtFmtColl ))
+ {
+ const SwTxtFmtColl* pC = (SwTxtFmtColl*)rWW8Wrt.pOutFmtNode;
+- //if( pC && MAXLEVEL > pC->GetOutlineLevel() ) //#outline level,removed by zhaojianwei
+- // nLvl = pC->GetOutlineLevel(); //<-end, ->add by zhaojianwei
+ if( pC && pC->IsAssignedToListLevelOfOutlineStyle() )
+- nLvl = static_cast<BYTE>(pC->GetAssignedOutlineStyleLevel()); //<-end,zhaojianwei
++ nLvl = static_cast<BYTE>(pC->GetAssignedOutlineStyleLevel());
+ }
+ }
+ }
Index: source/filter/ww8/ww8par5.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par5.cxx,v
openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 13 Feb 2009 09:47:24 -0000 1.1
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 13 Feb 2009 12:15:19 -0000 1.2
@@ -18,3 +18,23 @@
void SwDoc::deleteBookmark( /*[in]*/sal_uInt16 nPos )
{
SwBookmark *pBM = (*pBookmarkTbl)[nPos];
+--- OOO310_m1.orig/sw/source/filter/ww8/WW8TableInfo.cxx 2009-02-13 10:25:13.000000000 +0000
++++ OOO310_m1/sw/source/filter/ww8/WW8TableInfo.cxx 2009-02-13 10:25:21.000000000 +0000
+@@ -32,6 +32,7 @@
+ #include "precompiled_sw.hxx"
+
+ #include <iostream>
++#include <stdio.h>
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+ #include "pam.hxx"
+--- OOO310_m1.orig/sc/source/filter/ftools/ftools.cxx 2009-02-13 11:14:25.000000000 +0000
++++ OOO310_m1/sc/source/filter/ftools/ftools.cxx 2009-02-13 11:14:37.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <sot/storage.hxx>
+
+ #include <math.h>
++#include <stdio.h>
+ #include "global.hxx"
+ #include "document.hxx"
+ #include "stlpool.hxx"
More information about the scm-commits
mailing list