summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-12 17:49:07 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-12 17:49:07 +0000
commitd2bf0ee216c83cea8707763b2dd507db2aa61e54 (patch)
tree1746d1f17fafc11cd0d2055bc77593adf5b3d829 /sd
parent02c8425085a9eadf37f08fb8a82c3f4bc5a5bbb8 (diff)
INTEGRATION: CWS sdwarningsbegone (1.4.38); FILE MERGED
2006/11/22 12:42:17 cl 1.4.38.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx6
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx6
2 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
index 36009e3bc567..8a4f5f7dc241 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: MasterPageContainerFiller.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 19:18:33 $
+ * last change: $Author: kz $ $Date: 2006-12-12 18:48:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -116,6 +116,8 @@ void MasterPageContainerFiller::RunNextStep (void)
mrContainerAdapter.FillingDone();
mpScannerTask.reset();
}
+ default:
+ break;
}
}
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
index 8a1ee26acb2d..9e65e278051c 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: MasterPageContainerQueue.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 19:19:02 $
+ * last change: $Author: kz $ $Date: 2006-12-12 18:49:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -116,8 +116,8 @@ MasterPageContainerQueue* MasterPageContainerQueue::Create (
MasterPageContainerQueue::MasterPageContainerQueue (
const ::boost::weak_ptr<ContainerAdapter>& rpContainer)
: mpWeakContainer(rpContainer),
- maDelayedPreviewCreationTimer(),
mpRequestQueue(new RequestQueue()),
+ maDelayedPreviewCreationTimer(),
mnRequestsServedCount(0)
{
}