summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/appmain.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 21:07:38 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 21:07:38 +0000
commit1a906796fbc013aeda5d96c54cc6c864b5cc9a52 (patch)
tree8351f5dba2a5e76f5ff4282900cf5f7b0d085c4a /sfx2/source/appl/appmain.cxx
parent34cf28adcb94ce369dd3d9799077acba187fe7af (diff)
INTEGRATION: CWS warnings01 (1.26.62); FILE MERGED
2006/05/29 08:19:45 sb 1.26.62.3: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170. 2006/05/23 21:24:38 sb 1.26.62.2: RESYNC: (1.26-1.27); FILE MERGED 2005/11/28 16:13:17 cd 1.26.62.1: #i55991# Remove warnings
Diffstat (limited to 'sfx2/source/appl/appmain.cxx')
-rw-r--r--sfx2/source/appl/appmain.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index ebae3fd60536..b921b706601f 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: appmain.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: rt $ $Date: 2006-05-02 16:16:37 $
+ * last change: $Author: hr $ $Date: 2006-06-19 22:07:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -99,11 +99,11 @@
//===================================================================
-DBG_NAME(SfxAppMainNewMenu);
-DBG_NAME(SfxAppMainBmkMenu);
-DBG_NAME(SfxAppMainWizMenu);
-DBG_NAME(SfxAppMainOLEReg);
-DBG_NAME(SfxAppMainCHAOSReg);
+DBG_NAME(SfxAppMainNewMenu)
+DBG_NAME(SfxAppMainBmkMenu)
+DBG_NAME(SfxAppMainWizMenu)
+DBG_NAME(SfxAppMainOLEReg)
+DBG_NAME(SfxAppMainCHAOSReg)
//===================================================================
@@ -122,7 +122,7 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] =
//===================================================================
typedef Link* LinkPtr;
-SV_DECL_PTRARR(SfxInitLinkList, LinkPtr, 4, 4);
+SV_DECL_PTRARR(SfxInitLinkList, LinkPtr, 4, 4)
TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
@@ -250,6 +250,7 @@ void SfxApplication::InsertLateInitHdl(const Link& rLink)
IMPL_LINK( SfxApplication, LateInitTimerHdl_Impl, void*, pvoid)
{
+ (void)pvoid; // unused variable
if ( !SfxViewFrame::GetFirst( 0,0,FALSE ) )
{
pAppData_Impl->aLateInitTimer.Start();