[Libreoffice-commits] .: 6 commits - binfilter/bf_sd binfilter/bf_sfx2 binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Jan 5 12:00:18 PST 2011
binfilter/bf_sd/source/core/makefile.mk | 1
binfilter/bf_sd/source/core/sd_anminfo.cxx | 19 +-
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 94 +++++++-------
binfilter/bf_sd/source/core/sd_drawdoc2.cxx | 52 ++++----
binfilter/bf_sd/source/core/sd_drawdoc3.cxx | 1
binfilter/bf_sd/source/core/sd_drawdoc4.cxx | 38 ++---
binfilter/bf_sd/source/core/sd_sdpage.cxx | 109 ++++++++---------
binfilter/bf_sd/source/core/sd_sdpage2.cxx | 6
binfilter/bf_sd/source/core/sd_stlsheet.cxx | 6
binfilter/bf_sd/source/filter/bin/makefile.mk | 1
binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx | 2
binfilter/bf_sd/source/filter/makefile.mk | 1
binfilter/bf_sd/source/filter/sd_propread.cxx | 6
binfilter/bf_sd/source/filter/sd_sdfilter.cxx | 2
binfilter/bf_sd/source/filter/xml/makefile.mk | 1
binfilter/bf_sfx2/source/explorer/makefile.mk | 2
binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx | 2
binfilter/bf_sfx2/source/inc/eventsupplier.hxx | 2
binfilter/bf_sfx2/source/notify/makefile.mk | 2
binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx | 14 +-
binfilter/bf_sfx2/util/makefile.mk | 2
binfilter/inc/bf_sfx2/genlink.hxx | 6
22 files changed, 179 insertions(+), 190 deletions(-)
New commits:
commit 2bc07bc22ef4edfb477d739b8bbd895bd5295414
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:58:21 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sfx2/source/explorer/makefile.mk b/binfilter/bf_sfx2/source/explorer/makefile.mk
index 5b6cbd9..e2b379f 100644
--- a/binfilter/bf_sfx2/source/explorer/makefile.mk
+++ b/binfilter/bf_sfx2/source/explorer/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx b/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx
index d14eafe..451b8f0 100644
--- a/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx
+++ b/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx
@@ -199,7 +199,7 @@ CntItemPool* CntItemPool::_pThePool = NULL;
/*N*/ }
//-------------------------------------------------------------------------
-/*N*/ CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* pPool )
+/*N*/ CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ )
/*N*/ : m_nItems( 1 ),
/*N*/ m_ppDefaults( new SfxPoolItem* [ m_nItems ] ),
/*N*/ m_pItemInfos( new SfxItemInfo [ m_nItems ] )
commit 329343ea4e26687b3d2c03fb414bd16b8bf2611a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:57:26 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
index 10c51c7..62b0c27 100644
--- a/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
+++ b/binfilter/bf_sfx2/source/inc/eventsupplier.hxx
@@ -142,7 +142,7 @@ public:
SFX_DECL_XSERVICEINFO
virtual REFERENCE< XNAMEREPLACE > SAL_CALL getEvents() throw( RUNTIMEEXCEPTION );
virtual void SAL_CALL addEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
- virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& /*xListener*/ ) throw( RUNTIMEEXCEPTION ) {DBG_BF_ASSERT(0, "STRIP");}
};
}//end of namespace binfilter
diff --git a/binfilter/bf_sfx2/source/notify/makefile.mk b/binfilter/bf_sfx2/source/notify/makefile.mk
index 4a234fb..e230f47 100644
--- a/binfilter/bf_sfx2/source/notify/makefile.mk
+++ b/binfilter/bf_sfx2/source/notify/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index b1d20a9..67fadf7 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -103,8 +103,8 @@ namespace binfilter {
/*N*/ SEQUENCE < PROPERTYVALUE > aProperties;
/*N*/ if ( aValue >>= aProperties )
/*N*/ {
-/*N*/ long nCount = aProperties.getLength();
-/*N*/ for ( long nIndex = 0; nIndex < nCount; nIndex++ )
+/*N*/ long nLclCount = aProperties.getLength();
+/*N*/ for ( long nIndex = 0; nIndex < nLclCount; nIndex++ )
/*N*/ {
/*N*/ if ( aProperties[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 )
/*N*/ {
@@ -157,8 +157,8 @@ namespace binfilter {
/*N*/ }
//--------------------------------------------------------------------------------------------------------
-/*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUSTRING& /*rName*/ ) throw ( RUNTIMEEXCEPTION )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
//--------------------------------------------------------------------------------------------------------
@@ -176,14 +176,14 @@ namespace binfilter {
//--------------------------------------------------------------------------------------------------------
// --- ::document::XEventListener ---
//--------------------------------------------------------------------------------------------------------
-/*N*/ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( RUNTIMEEXCEPTION )
+/*N*/ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& /*aEvent*/ ) throw( RUNTIMEEXCEPTION )
/*N*/ {
/*N*/ }
//--------------------------------------------------------------------------------------------------------
// --- ::lang::XEventListener ---
//--------------------------------------------------------------------------------------------------------
-/*N*/ void SAL_CALL SfxEvents_Impl::disposing( const EVENTOBJECT& Source ) throw( RUNTIMEEXCEPTION )
+/*N*/ void SAL_CALL SfxEvents_Impl::disposing( const EVENTOBJECT& /*Source*/ ) throw( RUNTIMEEXCEPTION )
/*N*/ {
/*N*/ ::osl::MutexGuard aGuard( maMutex );
/*N*/
@@ -435,7 +435,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SfxGlobalEvents_Impl::Notify( SfxBroadcaster& aBC, const SfxHint& aHint )
+/*N*/ void SfxGlobalEvents_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& aHint )
/*N*/ {
/*N*/ SfxEventHint* pNamedHint = PTR_CAST( SfxEventHint, &aHint );
/*N*/ if ( pNamedHint )
diff --git a/binfilter/bf_sfx2/util/makefile.mk b/binfilter/bf_sfx2/util/makefile.mk
index 37c02b8..1859666 100644
--- a/binfilter/bf_sfx2/util/makefile.mk
+++ b/binfilter/bf_sfx2/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
BFPRJ=..
PRJ=..$/..
diff --git a/binfilter/inc/bf_sfx2/genlink.hxx b/binfilter/inc/bf_sfx2/genlink.hxx
index 2f75db7..852aab4 100644
--- a/binfilter/inc/bf_sfx2/genlink.hxx
+++ b/binfilter/inc/bf_sfx2/genlink.hxx
@@ -41,8 +41,10 @@ public:
GenLink(): pFunc(0) {}
GenLink( CFuncPtr pCFunc ): pFunc(pCFunc) {}
GenLink( const Link& rLink ): aLink(rLink), pFunc(0) {}
- GenLink( const GenLink& rOrig ):
- pFunc(rOrig.pFunc), aLink(rOrig.aLink) {}
+ GenLink( const GenLink& rOrig )
+ : aLink(rOrig.aLink)
+ , pFunc(rOrig.pFunc)
+ {}
GenLink& operator = ( const GenLink& rOrig )
{ pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; }
commit fccfcda57f8c5337f5f9760a3ac66768c35bc759
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:40:13 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sd/source/core/makefile.mk b/binfilter/bf_sd/source/core/makefile.mk
index 18a87dc..61c844e 100644
--- a/binfilter/bf_sd/source/core/makefile.mk
+++ b/binfilter/bf_sd/source/core/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sd/source/core/sd_anminfo.cxx b/binfilter/bf_sd/source/core/sd_anminfo.cxx
index e68d037..0660fe2 100644
--- a/binfilter/bf_sd/source/core/sd_anminfo.cxx
+++ b/binfilter/bf_sd/source/core/sd_anminfo.cxx
@@ -55,6 +55,7 @@ using namespace ::com::sun::star;
/*N*/ SdAnimationInfo::SdAnimationInfo(SdDrawDocument* pTheDoc)
/*N*/ : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID, 0),
+/*N*/ pDoc (pTheDoc),
/*N*/ pPolygon (NULL),
/*N*/ eEffect (presentation::AnimationEffect_NONE),
/*N*/ eTextEffect (presentation::AnimationEffect_NONE),
@@ -72,11 +73,10 @@ using namespace ::com::sun::star;
/*N*/ eSecondSpeed (presentation::AnimationSpeed_SLOW),
/*N*/ bSecondSoundOn (FALSE),
/*N*/ bSecondPlayFull (FALSE),
-/*N*/ bInvisibleInPresentation (FALSE),
/*N*/ nVerb (0),
-/*N*/ pDoc (pTheDoc),
-/*N*/ bShow (TRUE),
+/*N*/ bInvisibleInPresentation (FALSE),
/*N*/ bIsShown (TRUE),
+/*N*/ bShow (TRUE),
/*N*/ bDimmed (FALSE),
/*N*/ nPresOrder (LIST_APPEND)
/*N*/ {
@@ -94,6 +94,8 @@ using namespace ::com::sun::star;
/*N*/ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo)
/*N*/ : SdrObjUserData (rAnmInfo),
+/*N*/ SfxListener(),
+/*N*/ pDoc (NULL),
/*N*/ pPolygon (NULL),
/*N*/ aStart (rAnmInfo.aStart),
/*N*/ aEnd (rAnmInfo.aEnd),
@@ -109,20 +111,19 @@ using namespace ::com::sun::star;
/*N*/ aSoundFile (rAnmInfo.aSoundFile),
/*N*/ bSoundOn (rAnmInfo.bSoundOn),
/*N*/ bPlayFull (rAnmInfo.bPlayFull),
-/*N*/ pPathObj (NULL),
/*N*/ pPathSuro (NULL),
+/*N*/ pPathObj (NULL),
/*N*/ eClickAction (rAnmInfo.eClickAction),
/*N*/ eSecondEffect (rAnmInfo.eSecondEffect),
/*N*/ eSecondSpeed (rAnmInfo.eSecondSpeed),
+/*N*/ aSecondSoundFile (rAnmInfo.aSecondSoundFile),
/*N*/ bSecondSoundOn (rAnmInfo.bSecondSoundOn),
/*N*/ bSecondPlayFull (rAnmInfo.bSecondPlayFull),
-/*N*/ bInvisibleInPresentation (rAnmInfo.bInvisibleInPresentation),
-/*N*/ nVerb (rAnmInfo.nVerb),
/*N*/ aBookmark (rAnmInfo.aBookmark),
-/*N*/ aSecondSoundFile (rAnmInfo.aSecondSoundFile),
-/*N*/ pDoc (NULL),
-/*N*/ bShow (rAnmInfo.bShow),
+/*N*/ nVerb (rAnmInfo.nVerb),
+/*N*/ bInvisibleInPresentation (rAnmInfo.bInvisibleInPresentation),
/*N*/ bIsShown (rAnmInfo.bIsShown),
+/*N*/ bShow (rAnmInfo.bShow),
/*N*/ bDimmed (rAnmInfo.bDimmed),
/*N*/ nPresOrder (LIST_APPEND)
/*N*/ {
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 419b232..b77a9b1 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -112,41 +112,41 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) :
FmFormModel(
SvtPathOptions().GetPalettePath(),
NULL, (SvPersist*)pDrDocSh ),
- eDocType(eType),
+ pOutliner(NULL),
+ pInternalOutliner(NULL),
+ pOnlineSpellingTimer(NULL),
+ pOnlineSpellingList(NULL),
+ pDeletedPresObjList(NULL),
+ pCustomShowList(NULL),
pDocSh( (SdDrawDocShell*) pDrDocSh ),
+ bHasOnlineSpellErrors(FALSE),
+ bInitialOnlineSpellingEnabled(TRUE),
+ bNewOrLoadCompleted(FALSE),
bPresAll(TRUE),
bPresEndless(FALSE),
bPresManual(FALSE),
bPresMouseVisible(TRUE),
bPresMouseAsPen(FALSE),
- bPresLockedPages(FALSE),
bStartPresWithNavigator(FALSE),
bAnimationAllowed(TRUE),
+ bPresLockedPages(FALSE),
bPresAlwaysOnTop(FALSE),
bPresFullScreen(TRUE),
nPresPause(10),
bPresShowLogo(FALSE),
bCustomShow(false),
+ mbStartWithPresentation( false ),
nPresFirstPage(1),
- pOutliner(NULL),
- pInternalOutliner(NULL),
+ eLanguage( LANGUAGE_SYSTEM ),
+ eLanguageCJK( LANGUAGE_SYSTEM ),
+ eLanguageCTL( LANGUAGE_SYSTEM ),
ePageNumType(SVX_ARABIC),
- bNewOrLoadCompleted(FALSE),
- pOnlineSpellingTimer(NULL),
- pOnlineSpellingList(NULL),
- bInitialOnlineSpellingEnabled(TRUE),
- bHasOnlineSpellErrors(FALSE),
- mpLocale(NULL),
- mpCharClass(NULL),
bAllocDocSh(FALSE),
- pDeletedPresObjList(NULL),
+ eDocType(eType),
nFileFormatVersion(SDIOCOMPAT_VERSIONDONTKNOW),
pDocStor(NULL),
- pCustomShowList(NULL),
- eLanguage( LANGUAGE_SYSTEM ),
- eLanguageCJK( LANGUAGE_SYSTEM ),
- eLanguageCTL( LANGUAGE_SYSTEM ),
- mbStartWithPresentation( false )
+ mpCharClass(NULL),
+ mpLocale(NULL)
{
SetObjectShell(pDrDocSh); // fuer das VCDrawModel
@@ -950,7 +950,6 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// Praesentationsobjekte muessen wieder Listener der entsprechenden
// Vorlagen werden
SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool();
- SfxStyleSheet* pSheet = NULL;
USHORT nPage, nPageCount;
// #96323# create missing layout style sheets for broken documents
@@ -988,12 +987,12 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
if (nObjCount)
{
// Listen mit Titel- und Gliederungsvorlagen erstellen
- String aName = pPage->GetLayoutName();
- aName.Erase( aName.SearchAscii( SD_LT_SEPARATOR ));
+ String aLclName = pPage->GetLayoutName();
+ aLclName.Erase( aLclName.SearchAscii( SD_LT_SEPARATOR ));
- List* pOutlineList = pSPool->CreateOutlineSheetList(aName);
+ List* pOutlineList = pSPool->CreateOutlineSheetList(aLclName);
SfxStyleSheet* pTitleSheet = (SfxStyleSheet*)
- pSPool->GetTitleSheet(aName);
+ pSPool->GetTitleSheet(aLclName);
// jetzt nach Titel- und Gliederungstextobjekten suchen und
// Objekte zu Listenern machen
@@ -1003,7 +1002,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
if (pObj->GetObjInventor() == SdrInventor)
{
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
- SdPage* pPage = (SdPage*) pObj->GetPage();
+ SdPage* pLclPage = (SdPage*) pObj->GetPage();
UINT16 nId = pObj->GetObjIdentifier();
if (nId == OBJ_TITLETEXT)
@@ -1022,29 +1021,29 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
for (USHORT nSheet = 0; nSheet < 10; nSheet++)
{
- pSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet);
- if (pSheet)
+ SfxStyleSheet *pLclSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet);
+ if (pLclSheet)
{
- pObj->StartListening(*pSheet);
+ pObj->StartListening(*pLclSheet);
if( nSheet == 0)
// Textrahmen hoert auf StyleSheet der Ebene1
- pObj->NbcSetStyleSheet(pSheet, TRUE);
+ pObj->NbcSetStyleSheet(pLclSheet, TRUE);
}
}
}
- if (pObj->ISA(SdrTextObj) && pObj->IsEmptyPresObj() && pPage)
+ if (pObj->ISA(SdrTextObj) && pObj->IsEmptyPresObj() && pLclPage)
{
- PresObjKind ePresObjKind = pPage->GetPresObjKind(pObj);
- String aString = pPage->GetPresObjText(ePresObjKind);
+ PresObjKind ePresObjKind = pLclPage->GetPresObjKind(pObj);
+ String aString = pLclPage->GetPresObjText(ePresObjKind);
if (aString.Len())
{
SdOutliner* pInternalOutl = GetInternalOutliner(TRUE);
pInternalOutl->SetMinDepth(0);
- pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
+ pLclPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
+ pObj->NbcSetStyleSheet( pLclPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
pInternalOutl->Clear();
}
}
@@ -1083,12 +1082,12 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
if (nObjCount)
{
// Listen mit Titel- und Gliederungsvorlagen erstellen
- String aName = pPage->GetLayoutName();
- aName.Erase(aName.SearchAscii( SD_LT_SEPARATOR ));
+ String aLclName = pPage->GetLayoutName();
+ aLclName.Erase(aLclName.SearchAscii( SD_LT_SEPARATOR ));
- List* pOutlineList = pSPool->CreateOutlineSheetList(aName);
+ List* pOutlineList = pSPool->CreateOutlineSheetList(aLclName);
SfxStyleSheet* pTitleSheet = (SfxStyleSheet*)
- pSPool->GetTitleSheet(aName);
+ pSPool->GetTitleSheet(aLclName);
// jetzt nach Titel- und Gliederungstextobjekten suchen und
// Objekte zu Listenern machen
@@ -1116,31 +1115,31 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
for (USHORT nSheet = 0; nSheet < 10; nSheet++)
{
- pSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet);
- if (pSheet)
+ SfxStyleSheet *pLclSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet);
+ if (pLclSheet)
{
- pObj->StartListening(*pSheet);
+ pObj->StartListening(*pLclSheet);
if( nSheet == 0)
// Textrahmen hoert auf StyleSheet der Ebene1
- pObj->NbcSetStyleSheet(pSheet, TRUE);
+ pObj->NbcSetStyleSheet(pLclSheet, TRUE);
}
}
}
- SdPage* pPage = (SdPage*) pObj->GetPage();
+ SdPage* pLclPage = (SdPage*) pObj->GetPage();
- if (pObj->ISA(SdrTextObj) && pObj->IsEmptyPresObj() && pPage)
+ if (pObj->ISA(SdrTextObj) && pObj->IsEmptyPresObj() && pLclPage)
{
- PresObjKind ePresObjKind = pPage->GetPresObjKind(pObj);
- String aString = pPage->GetPresObjText(ePresObjKind);
+ PresObjKind ePresObjKind = pLclPage->GetPresObjKind(pObj);
+ String aString = pLclPage->GetPresObjText(ePresObjKind);
if (aString.Len())
{
SdOutliner* pInternalOutl = GetInternalOutliner(TRUE);
pInternalOutl->SetMinDepth(0);
- pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
+ pLclPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
+ pObj->NbcSetStyleSheet( pLclPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
pInternalOutl->Clear();
}
}
@@ -1309,9 +1308,8 @@ uno::Reference< uno::XInterface > SdDrawDocument::createUnoModel()
{
xModel = pDocSh->GetModel();
}
- catch( uno::RuntimeException& e )
+ catch( uno::RuntimeException& )
{
- e; // to avoid a compiler warning...
}
return xModel;
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
index 500cebb..f1c72cc 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
@@ -240,7 +240,7 @@ void SdDrawDocument::CreateFirstPages()
Size aDefSize(21000, 29700); // A4-Hochformat
BOOL bMasterPage;
- SdPage* pHandoutPage = (SdPage*) AllocPage(bMasterPage=FALSE);
+ SdPage* pHandoutPage = (SdPage*) AllocPage((bMasterPage=FALSE));
// Stets Querformat
if (aDefSize.Height() <= aDefSize.Width())
@@ -257,7 +257,7 @@ void SdDrawDocument::CreateFirstPages()
pHandoutPage->SetName( String (SdResId(STR_HANDOUT) ) );
InsertPage(pHandoutPage, 0);
- SdPage* pHandoutMPage = (SdPage*) AllocPage(bMasterPage=TRUE);
+ SdPage* pHandoutMPage = (SdPage*) AllocPage((bMasterPage=TRUE));
pHandoutMPage->SetSize( pHandoutPage->GetSize() );
pHandoutMPage->SetPageKind(PK_HANDOUT);
pHandoutMPage->SetBorder( pHandoutPage->GetLftBorder(),
@@ -272,7 +272,7 @@ void SdDrawDocument::CreateFirstPages()
if (nPageCount == 0)
{
- pPage = (SdPage*) AllocPage(bMasterPage=FALSE);
+ pPage = (SdPage*) AllocPage((bMasterPage=FALSE));
if (eDocType == DOCUMENT_TYPE_DRAW)
{
@@ -298,7 +298,7 @@ void SdDrawDocument::CreateFirstPages()
/**********************************************************************
* MasterPage einfuegen und an der Seite vermerken
**********************************************************************/
- SdPage* pMPage = (SdPage*) AllocPage(bMasterPage=TRUE);
+ SdPage* pMPage = (SdPage*) AllocPage((bMasterPage=TRUE));
pMPage->SetSize( pPage->GetSize() );
pMPage->SetBorder( pPage->GetLftBorder(),
pPage->GetUppBorder(),
@@ -312,7 +312,7 @@ void SdDrawDocument::CreateFirstPages()
/**********************************************************************
* Notizen-Seite einfuegen
**********************************************************************/
- SdPage* pNotesPage = (SdPage*) AllocPage(bMasterPage=FALSE);
+ SdPage* pNotesPage = (SdPage*) AllocPage((bMasterPage=FALSE));
// Stets Hochformat
if (aDefSize.Height() >= aDefSize.Width())
@@ -333,7 +333,7 @@ void SdDrawDocument::CreateFirstPages()
/**********************************************************************
* MasterPage einfuegen und an der Notizen-Seite vermerken
**********************************************************************/
- SdPage* pNotesMPage = (SdPage*) AllocPage(bMasterPage=TRUE);
+ SdPage* pNotesMPage = (SdPage*) AllocPage((bMasterPage=TRUE));
pNotesMPage->SetSize( pNotesPage->GetSize() );
pNotesMPage->SetPageKind(PK_NOTES);
pNotesMPage->SetBorder( pNotesPage->GetLftBorder(),
@@ -353,30 +353,30 @@ void SdDrawDocument::CreateFirstPages()
void SdDrawDocument::SetLanguage( const LanguageType eLang, const USHORT nId )
{
- BOOL bChanged = FALSE;
+ BOOL bLclChanged = FALSE;
if( nId == EE_CHAR_LANGUAGE && eLanguage != eLang )
{
eLanguage = eLang;
- bChanged = TRUE;
+ bLclChanged = TRUE;
}
else if( nId == EE_CHAR_LANGUAGE_CJK && eLanguageCJK != eLang )
{
eLanguageCJK = eLang;
- bChanged = TRUE;
+ bLclChanged = TRUE;
}
else if( nId == EE_CHAR_LANGUAGE_CTL && eLanguageCTL != eLang )
{
eLanguageCTL = eLang;
- bChanged = TRUE;
+ bLclChanged = TRUE;
}
- if( bChanged )
+ if( bLclChanged )
{
GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguage() );
pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) );
- SetChanged( bChanged );
+ SetChanged( bLclChanged );
}
}
@@ -396,7 +396,7 @@ LanguageType SdDrawDocument::GetLanguage( const USHORT nId ) const
void SdDrawDocument::WorkStartupHdl()
{
- BOOL bChanged = IsChanged();
+ BOOL bLclChanged = IsChanged();
SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
@@ -413,7 +413,7 @@ void SdDrawDocument::WorkStartupHdl()
if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, TRUE);
- SetChanged(bChanged || FALSE);
+ SetChanged(bLclChanged || FALSE);
}
SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const
@@ -482,7 +482,7 @@ void SdDrawDocument::CheckMasterPages()
{
// there is a fatal error in the master page order,
// we need to repair the document
- sal_Bool bChanged = sal_False;
+ sal_Bool bLclChanged = sal_False;
nPage = 1;
while( nPage < nMaxPages )
@@ -490,7 +490,7 @@ void SdDrawDocument::CheckMasterPages()
pPage = static_cast<SdPage*> (GetMasterPage( nPage ));
if( pPage->GetPageKind() != PK_STANDARD )
{
- bChanged = sal_True;
+ bLclChanged = sal_True;
USHORT nFound = nPage + 1;
while( nFound < nMaxPages )
{
@@ -520,7 +520,7 @@ void SdDrawDocument::CheckMasterPages()
if( (NULL == pNotesPage) || (pNotesPage->GetPageKind() != PK_NOTES) || ( pPage->GetLayoutName() != pNotesPage->GetLayoutName() ) )
{
- bChanged = sal_True;
+ bLclChanged = sal_True;
USHORT nFound = nPage + 1;
while( nFound < nMaxPages )
@@ -554,19 +554,19 @@ void SdDrawDocument::CheckMasterPages()
if( nFound == nMaxPages )
pRefNotesPage = NULL;
- SdPage* pNotesPage = static_cast<SdPage*>(AllocPage(sal_True));
- pNotesPage->SetPageKind(PK_NOTES);
+ SdPage* pLclNotesPage = static_cast<SdPage*>(AllocPage(sal_True));
+ pLclNotesPage->SetPageKind(PK_NOTES);
if( pRefNotesPage )
{
- pNotesPage->SetSize( pRefNotesPage->GetSize() );
- pNotesPage->SetBorder( pRefNotesPage->GetLftBorder(),
+ pLclNotesPage->SetSize( pRefNotesPage->GetSize() );
+ pLclNotesPage->SetBorder( pRefNotesPage->GetLftBorder(),
pRefNotesPage->GetUppBorder(),
pRefNotesPage->GetRgtBorder(),
pRefNotesPage->GetLwrBorder() );
}
- InsertMasterPage(pNotesPage, nPage );
- pNotesPage->SetLayoutName( pPage->GetLayoutName() );
- pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
+ InsertMasterPage(pLclNotesPage, nPage );
+ pLclNotesPage->SetLayoutName( pPage->GetLayoutName() );
+ pLclNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
nMaxPages++;
}
}
@@ -577,13 +577,13 @@ void SdDrawDocument::CheckMasterPages()
// now remove all remaining and unused non PK_STANDARD slides
while( nPage < nMaxPages )
{
- bChanged = sal_True;
+ bLclChanged = sal_True;
RemoveMasterPage( nPage );
nMaxPages--;
}
- if( bChanged )
+ if( bLclChanged )
{
DBG_ERROR( "master pages where in a wrong order" );
RecalcPageNums( sal_True);
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc3.cxx b/binfilter/bf_sd/source/core/sd_drawdoc3.cxx
index 5c7ad92..bab86b0 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc3.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc3.cxx
@@ -228,6 +228,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo)
{
BOOL bOK = pStor->Rename(pStarDrawDoc, pStarDrawDoc3);
DBG_ASSERT(bOK, "Umbenennung des Streams gescheitert");
+ (void)bOK;
}
SotStorageStreamRef docStream = pStor->OpenSotStream( pStarDrawDoc3, STREAM_READ );
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
index 80819e5..f096108 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star::linguistic2;
void SdDrawDocument::CreateLayoutTemplates()
{
- SdStyleSheetPool* pStyleSheetPool = (SdStyleSheetPool*)GetStyleSheetPool();
+ SdStyleSheetPool* pLclStyleSheetPool = (SdStyleSheetPool*)GetStyleSheetPool();
SfxStyleSheetBase* pSheet = NULL;
String aHelpFile;
String aStdName = String(SdResId(STR_STANDARD_STYLESHEET_NAME));
@@ -112,7 +112,7 @@ void SdDrawDocument::CreateLayoutTemplates()
USHORT nMask = SFXSTYLEBIT_AUTO;
String aName(aStdName);
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetHelpId( aHelpFile, HID_STANDARD_STYLESHEET_NAME );
SfxItemSet& rISet = pSheet->GetItemSet();
SfxItemPool* pPool = rISet.GetPool();
@@ -207,7 +207,7 @@ void SdDrawDocument::CreateLayoutTemplates()
aBulletItem.SetStart(1);
aBulletItem.SetScale(45); // in Prozent
- Font aBulletFont( pStyleSheetPool->GetBulletFont() );
+ Font aBulletFont( pLclStyleSheetPool->GetBulletFont() );
aBulletFont.SetSize(Size(0,846)); // 24 pt
aBulletItem.SetFont(aBulletFont);
aBulletItem.SetSymbol( 0x25CF ); // Punkt
@@ -217,14 +217,14 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(aBulletStateItem);
// Neues BulletItem
- pStyleSheetPool->PutNumBulletItem( pSheet, aBulletFont );
+ pLclStyleSheetPool->PutNumBulletItem( pSheet, aBulletFont );
SfxItemSet* pISet = NULL;
// ---- Objekt mit Pfeilspitze ----------------------------------------
aName = String(SdResId(STR_POOLSHEET_OBJWITHARROW));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
pISet = &pSheet->GetItemSet();
@@ -247,7 +247,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt mit Schatten -------------------------------------------
aName = String(SdResId(STR_POOLSHEET_OBJWITHSHADOW));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
pISet = &pSheet->GetItemSet();
@@ -260,7 +260,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Objekt ohne Fllung -------------------------------------------
aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
pISet = &pSheet->GetItemSet();
@@ -270,7 +270,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Text ----------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXT));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
pISet = &pSheet->GetItemSet();
@@ -281,7 +281,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper ----------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXTBODY));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
pISet = &pSheet->GetItemSet();
@@ -294,7 +294,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textk”rper mit Blocksatz --------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
pISet = &pSheet->GetItemSet();
@@ -307,7 +307,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Textkoerper mit Einzug -----------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXTBODY_INDENT));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
pISet = &pSheet->GetItemSet();
@@ -327,7 +327,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel ---------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TITLE));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
pISet = &pSheet->GetItemSet();
@@ -340,7 +340,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel1 --------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TITLE1));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
pISet = &pSheet->GetItemSet();
@@ -361,7 +361,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Titel2 --------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TITLE2));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
pISet = &pSheet->GetItemSet();
@@ -394,7 +394,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift ---------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_HEADLINE));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
pISet = &pSheet->GetItemSet();
@@ -410,7 +410,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift1 --------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_HEADLINE1));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
pISet = &pSheet->GetItemSet();
@@ -428,7 +428,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Ueberschrift2 --------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_HEADLINE2));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
pISet = &pSheet->GetItemSet();
@@ -447,7 +447,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// ---- Bemassung --------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_MEASURE));
- pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
+ pSheet = &(pLclStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
pISet = &pSheet->GetItemSet();
@@ -463,7 +463,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Praesentationsvorlagen fuer das Standardlayout erzeugen
String aPrefix = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
- pStyleSheetPool->CreateLayoutStyleSheets(aPrefix);
+ pLclStyleSheetPool->CreateLayoutStyleSheets(aPrefix);
}
USHORT SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx
index 6560ab2..1efd601 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx
@@ -65,9 +65,12 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
|*
\************************************************************************/
-SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage) :
- FmFormPage(rNewDoc, pBasic, bMasterPage),
+SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pInBasic, BOOL bMasterPage) :
+ FmFormPage(rNewDoc, pInBasic, bMasterPage),
SdrObjUserCall(),
+ ePageKind(PK_STANDARD),
+ eAutoLayout(AUTOLAYOUT_NONE),
+ bOwnArrangement(FALSE),
bSelected(FALSE),
eFadeSpeed(FADE_SPEED_MEDIUM),
eFadeEffect(::com::sun::star::presentation::FadeEffect_NONE),
@@ -75,9 +78,6 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage) :
nTime(1),
bSoundOn(FALSE),
bExcluded(FALSE),
- eAutoLayout(AUTOLAYOUT_NONE),
- bOwnArrangement(FALSE),
- ePageKind(PK_STANDARD),
bScaleObjects(TRUE),
bBackgroundFullSize( FALSE ),
nPaperBin(PAPERBIN_PRINTER_SETTINGS),
@@ -145,8 +145,8 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, USHORT nIndex)
SdrObjKind eSdrObjKind = (SdrObjKind) pObj->GetObjIdentifier();
if (pObj->GetObjInventor() == SdrInventor &&
- (eObjKind==PRESOBJ_TITLE && eSdrObjKind == OBJ_TITLETEXT ||
- eObjKind==PRESOBJ_OUTLINE && eSdrObjKind == OBJ_OUTLINETEXT))
+ ( (eObjKind==PRESOBJ_TITLE && eSdrObjKind == OBJ_TITLETEXT) ||
+ (eObjKind==PRESOBJ_OUTLINE && eSdrObjKind == OBJ_OUTLINETEXT) ))
{
nObjFound++; // Uebereinstimmendes Objekt gefunden
}
@@ -231,8 +231,8 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
}
else if (eObjKind == PRESOBJ_HANDOUT)
{
- SdrPage* pPage = ( (SdDrawDocument*) pModel )->GetSdPage(0, PK_STANDARD);
- pSdrObj = new SdrPageObj( pPage->GetPageNum() );
+ SdrPage* pLclPage = ( (SdDrawDocument*) pModel )->GetSdPage(0, PK_STANDARD);
+ pSdrObj = new SdrPageObj( pLclPage->GetPageNum() );
pSdrObj->SetResizeProtect(TRUE);
}
else if (eObjKind == PRESOBJ_PAGE)
@@ -392,7 +392,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind)
return (SfxStyleSheet*)pResult;
}
-void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect)
+void SdPage::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType*/, const Rectangle& /*rOldBoundRect*/)
{
}
@@ -462,11 +462,11 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bAPICall )
for (USHORT i = 0; i < nPgCount && bDeletePresObjOnMaster; i++)
{
- SdPage* pPage = ((SdDrawDocument*) pModel)->GetSdPage(i, ePageKind);
+ SdPage* pLclPage = ((SdDrawDocument*) pModel)->GetSdPage(i, ePageKind);
- if (pPage &&
- pPage->GetMasterPage(0) == pMasterPage &&
- pPage->GetAutoLayout() != AUTOLAYOUT_NONE)
+ if (pLclPage &&
+ pLclPage->GetMasterPage(0) == pMasterPage &&
+ pLclPage->GetAutoLayout() != AUTOLAYOUT_NONE)
{
// Seite referenziert die aktuelle MasterPage
// und hat ein gueltiges (kein leeres!) AutoLayout
@@ -561,17 +561,17 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bAPICall )
aPartArea.Width() = ((aArea.Width() + nGapW) / nColCnt) - nGapW;
aPartArea.Height() = ((aArea.Height() + nGapH) / nRowCnt) - nGapH;
- SdrPage* pPage = ((SdDrawDocument*) pModel)->
+ SdrPage* pLclPage = ((SdDrawDocument*) pModel)->
GetSdPage(0, PK_STANDARD);
- if ( pPage )
+ if ( pLclPage )
{ // tatsaechliche Seitengroesse in das Handout-Rechteck skalieren
- double fH = (double) aPartArea.Width() / pPage->GetWdt();
- double fV = (double) aPartArea.Height() / pPage->GetHgt();
+ double fH = (double) aPartArea.Width() / pLclPage->GetWdt();
+ double fV = (double) aPartArea.Height() / pLclPage->GetHgt();
if ( fH > fV )
fH = fV;
- aSize.Width() = (long) (fH * pPage->GetWdt());
- aSize.Height() = (long) (fH * pPage->GetHgt());
+ aSize.Width() = (long) (fH * pLclPage->GetWdt());
+ aSize.Height() = (long) (fH * pLclPage->GetHgt());
nX += (aPartArea.Width() - aSize.Width()) / 2;
nY += (aPartArea.Height()- aSize.Height())/ 2;
@@ -652,17 +652,17 @@ Rectangle SdPage::GetTitleRect() const
Size aPartArea = aTitleSize;
Size aSize;
- SdrPage* pPage = pModel->GetPage( GetPageNum() - 1 );
+ SdrPage* pLclPage = pModel->GetPage( GetPageNum() - 1 );
- if ( pPage )
+ if ( pLclPage )
{
- double fH = (double) aPartArea.Width() / pPage->GetWdt();
- double fV = (double) aPartArea.Height() / pPage->GetHgt();
+ double fH = (double) aPartArea.Width() / pLclPage->GetWdt();
+ double fV = (double) aPartArea.Height() / pLclPage->GetHgt();
if ( fH > fV )
fH = fV;
- aSize.Width() = (long) (fH * pPage->GetWdt());
- aSize.Height() = (long) (fH * pPage->GetHgt());
+ aSize.Width() = (long) (fH * pLclPage->GetWdt());
+ aSize.Height() = (long) (fH * pLclPage->GetHgt());
aPos.X() += (aPartArea.Width() - aSize.Width()) / 2;
aPos.Y() += (aPartArea.Height()- aSize.Height())/ 2;
@@ -816,7 +816,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
pObj->SetUserCall(this);
}
- if (pObj && !pObj->IsEmptyPresObj() || !bInit)
+ if ((pObj && !pObj->IsEmptyPresObj()) || !bInit)
aObjList.Insert(pObj, LIST_APPEND);
nObjKind[1] = PRESOBJ_OUTLINE;
@@ -828,7 +828,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
pObj->SetUserCall(this);
}
- if (pObj && !pObj->IsEmptyPresObj() || !bInit)
+ if ((pObj && !pObj->IsEmptyPresObj()) || !bInit)
aObjList.Insert(pObj, LIST_APPEND);
}
break;
@@ -898,12 +898,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
nObjKind[1] = PRESOBJ_OUTLINE;
pObj = GetPresObj(nObjKind[1]);
- USHORT nIndex = 1;
+ USHORT nLclIndex = 1;
if ( InsertPresObj(pObj, nObjKind[1], FALSE, aRect1, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[2] = PRESOBJ_OUTLINE;
- pObj = GetPresObj(nObjKind[2], nIndex);
+ pObj = GetPresObj(nObjKind[2], nLclIndex);
InsertPresObj(pObj, nObjKind[2], FALSE, aRect2, bInit, aObjList);
}
break;
@@ -1102,12 +1102,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
nObjKind[2] = PRESOBJ_OBJECT;
pObj = GetPresObj(nObjKind[2]);
- USHORT nIndex = 1;
+ USHORT nLclIndex = 1;
if ( InsertPresObj(pObj, nObjKind[2], FALSE, aRect2, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[3] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[3], nIndex);
+ pObj = GetPresObj(nObjKind[3], nLclIndex);
InsertPresObj(pObj, nObjKind[3], FALSE, aRect3, bInit, aObjList);
}
break;
@@ -1188,12 +1188,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
nObjKind[1] = PRESOBJ_OBJECT;
pObj = GetPresObj(nObjKind[1]);
- USHORT nIndex = 1;
+ USHORT nLclIndex = 1;
if ( InsertPresObj(pObj, nObjKind[1], FALSE, aRect1, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[2] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[2], nIndex);
+ pObj = GetPresObj(nObjKind[2], nLclIndex);
InsertPresObj(pObj, nObjKind[2], FALSE, aRect2, bInit, aObjList);
nObjKind[3] = PRESOBJ_OUTLINE;
@@ -1223,12 +1223,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
nObjKind[1] = PRESOBJ_OBJECT;
pObj = GetPresObj(nObjKind[1]);
- USHORT nIndex = 1;
+ USHORT nLclIndex = 1;
if ( InsertPresObj(pObj, nObjKind[1], FALSE, aRect1, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[2] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[2], nIndex);
+ pObj = GetPresObj(nObjKind[2], nLclIndex);
InsertPresObj(pObj, nObjKind[2], FALSE, aRect2, bInit, aObjList);
nObjKind[3] = PRESOBJ_OUTLINE;
@@ -1262,7 +1262,6 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
case AUTOLAYOUT_4OBJ:
{
ULONG nX = long (aLayoutPos.X());
- ULONG nY = long (aLayoutPos.Y());
aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477);
aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488);
@@ -1283,22 +1282,22 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
nObjKind[1] = PRESOBJ_OBJECT;
pObj = GetPresObj(nObjKind[1]);
- USHORT nIndex = 1;
+ USHORT nLclIndex = 1;
if ( InsertPresObj(pObj, nObjKind[1], FALSE, aRect1, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[2] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[2], nIndex);
+ pObj = GetPresObj(nObjKind[2], nLclIndex);
if ( InsertPresObj(pObj, nObjKind[2], FALSE, aRect2, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[3] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[3], nIndex);
+ pObj = GetPresObj(nObjKind[3], nLclIndex);
if ( InsertPresObj(pObj, nObjKind[3], FALSE, aRect3, bInit, aObjList) )
- nIndex++;
+ nLclIndex++;
nObjKind[4] = PRESOBJ_OBJECT;
- pObj = GetPresObj(nObjKind[4], nIndex);
+ pObj = GetPresObj(nObjKind[4], nLclIndex);
InsertPresObj(pObj, nObjKind[4], FALSE, aRect4, bInit, aObjList);
}
break;
@@ -1325,10 +1324,10 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
pObj->SetItem( SdrTextAutoGrowWidthItem(TRUE) );
pObj->SetItem( SdrTextAutoGrowHeightItem(FALSE) );
}
- Size aLayoutSize ( GetSize() );
- aLayoutSize.Height() -= GetUppBorder() + GetLwrBorder();
+ Size aLclLayoutSize ( GetSize() );
+ aLclLayoutSize.Height() -= GetUppBorder() + GetLwrBorder();
aSize.Height() = long ( aRect0.GetSize().Height() * 0.47 );
- aSize.Width() = long( aLayoutSize.Width() * 0.7 );
+ aSize.Width() = long( aLclLayoutSize.Width() * 0.7 );
aRect1.SetPos( aTitleRect.TopLeft() );
aRect1.SetSize( aSize );
nObjKind[1] = PRESOBJ_OUTLINE;
@@ -1369,10 +1368,10 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bAPICall )
pObj->SetItem( SdrTextAutoGrowWidthItem(TRUE) );
pObj->SetItem( SdrTextAutoGrowHeightItem(FALSE) );
}
- Size aLayoutSize ( GetSize() );
- aLayoutSize.Height() -= GetUppBorder() + GetLwrBorder();
+ Size aLclLayoutSize ( GetSize() );
+ aLclLayoutSize.Height() -= GetUppBorder() + GetLwrBorder();
aSize.Height() = aRect0.GetSize().Height();
- aSize.Width() = long( aLayoutSize.Width() * 0.7 );
+ aSize.Width() = long( aLclLayoutSize.Width() * 0.7 );
aRect1.SetPos( aTitleRect.TopLeft() );
aRect1.SetSize( aSize );
nObjKind[1] = PRESOBJ_OUTLINE;
@@ -1978,8 +1977,6 @@ const String& SdPage::GetName()
!bMaster)
{
USHORT nNum = (GetPageNum() + 1) / 2;
- BOOL bUpper = FALSE;
-
aCreatedPageName = String(SdResId(STR_PAGE));
aCreatedPageName += sal_Unicode( ' ' );
aCreatedPageName += ((SdDrawDocument*) GetModel())->CreatePageNumValue(nNum);
diff --git a/binfilter/bf_sd/source/core/sd_sdpage2.cxx b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
index f7a0e4f..6f575f4 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage2.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
@@ -367,13 +367,13 @@ SdPage::SdPage(const SdPage& rSrcPage)
SdrPage* SdPage::Clone() const
{
- SdPage* pPage = new SdPage(*this);
+ SdPage* pLclPage = new SdPage(*this);
if( (PK_STANDARD == ePageKind) && !IsMasterPage() )
{
// preserve presentation order on slide duplications
SdrObjListIter aSrcIter( *this, IM_DEEPWITHGROUPS );
- SdrObjListIter aDstIter( *pPage, IM_DEEPWITHGROUPS );
+ SdrObjListIter aDstIter( *pLclPage, IM_DEEPWITHGROUPS );
while( aSrcIter.IsMore() && aDstIter.IsMore() )
{
@@ -394,7 +394,7 @@ SdrPage* SdPage::Clone() const
DBG_ASSERT( !aSrcIter.IsMore() && !aDstIter.IsMore(), "unequal shape numbers after a page clone?" );
}
- return(pPage);
+ return(pLclPage);
}
SfxStyleSheet* SdPage::GetTextStyleSheetForObject( SdrObject* pObj ) const
diff --git a/binfilter/bf_sd/source/core/sd_stlsheet.cxx b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
index 8a8ce9a..9941017 100644
--- a/binfilter/bf_sd/source/core/sd_stlsheet.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlsheet.cxx
@@ -57,9 +57,9 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdStyleSheet::SdStyleSheet(const String& rName, SfxStyleSheetBasePool& rPool,
-/*N*/ SfxStyleFamily eFamily, USHORT nMask) :
-/*N*/ SfxStyleSheet(rName, rPool, eFamily, nMask)
+/*N*/ SdStyleSheet::SdStyleSheet(const String& rName, SfxStyleSheetBasePool& rInPool,
+/*N*/ SfxStyleFamily eFamily, USHORT nInMask) :
+/*N*/ SfxStyleSheet(rName, rInPool, eFamily, nInMask)
/*N*/ {
/*N*/ }
commit d7ec7d3f3ea223e502755338d7982a2e30bffc7a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:07:11 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sd/source/filter/bin/makefile.mk b/binfilter/bf_sd/source/filter/bin/makefile.mk
index af311b1..84068e9 100644
--- a/binfilter/bf_sd/source/filter/bin/makefile.mk
+++ b/binfilter/bf_sd/source/filter/bin/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx b/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx
index b865d87..2ef6a18 100644
--- a/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx
+++ b/binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx
@@ -395,7 +395,7 @@ sal_Bool SdBINFilter::Import()
if( bKeySet )
xDocStm->SetKey( aStrKey );
- if( bRet = ( xDocStm->GetError() == 0 ) )
+ if( (bRet = ( xDocStm->GetError() == 0 )) )
{
xDocStm->SetBufferSize( DOCUMENT_BUFFER_SIZE );
if( bKeySet )
commit 2995007a085c7fe25971fe1b81dde27c8fa1ed3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:06:26 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sd/source/filter/makefile.mk b/binfilter/bf_sd/source/filter/makefile.mk
index 7e28a30..642d8d9 100644
--- a/binfilter/bf_sd/source/filter/makefile.mk
+++ b/binfilter/bf_sd/source/filter/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sd/source/filter/sd_propread.cxx b/binfilter/bf_sd/source/filter/sd_propread.cxx
index 1a5520a..76fd78b 100644
--- a/binfilter/bf_sd/source/filter/sd_propread.cxx
+++ b/binfilter/bf_sd/source/filter/sd_propread.cxx
@@ -38,13 +38,13 @@ PropItem& PropItem::operator=( PropItem& rPropItem )
if ( this != &rPropItem )
{
Seek( STREAM_SEEK_TO_BEGIN );
- delete[] SwitchBuffer();
+ delete[] (sal_uInt8*)SwitchBuffer();
mnTextEnc = rPropItem.mnTextEnc;
- sal_uInt32 nPos = rPropItem.Tell();
+ sal_uInt32 nLclPos = rPropItem.Tell();
rPropItem.Seek( STREAM_SEEK_TO_END );
SvMemoryStream::Write( rPropItem.GetData(), rPropItem.Tell() );
- rPropItem.Seek( nPos );
+ rPropItem.Seek( nLclPos );
}
return *this;
}
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 034087e..dea10f9 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -58,10 +58,10 @@ using namespace ::com::sun::star::frame;
// ------------
SdFilter::SdFilter( SfxMedium& rMedium, SdDrawDocShell& rDocShell, sal_Bool bShowProgress ) :
+ mxModel( rDocShell.GetModel() ),
mrMedium( rMedium ),
mrDocShell( rDocShell ),
mrDocument( *rDocShell.GetDoc() ),
- mxModel( rDocShell.GetModel() ),
mpProgress( NULL ),
mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ),
mbShowProgress( bShowProgress )
commit 4e6b2c004147f2daf46f089281ba9a55debf2e01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:03:44 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sd/source/filter/xml/makefile.mk b/binfilter/bf_sd/source/filter/xml/makefile.mk
index 1156047..cfc31a2 100644
--- a/binfilter/bf_sd/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sd/source/filter/xml/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
More information about the Libreoffice-commits
mailing list