summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-05-10 18:58:50 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-05-10 18:58:50 +0200
commit012dcb14021a96afcfaa4bd223e3d0b7b7bc45f0 (patch)
treea0e9fef8552f6555d4dad28f80f5e929d1c31e90
parentab4b40723ecf9d267b3560827aa1b6f060d66c0a (diff)
parenta7e57c1a9cb29c53450db437e48dc9ccbf7155c8 (diff)
CWS-TOOLING: integrate CWS dtardon01
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx4
-rw-r--r--sw/source/ui/uiview/view.cxx5
3 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 23fa8ecb2c34..8a13d5768cb6 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -35,6 +35,10 @@
#include <algorithm>
#include <functional>
#include <iostream>
+#if OSL_DEBUG_LEVEL > 0
+# include <cstdio>
+#endif
+
#include <hintids.hxx>
#include <tools/urlobj.hxx>
#include <editeng/boxitem.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 64e70d40dfdc..96dfb38c0138 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -30,6 +30,10 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+#if OSL_DEBUG_LEVEL > 0
+# include <cstdio>
+#endif
+
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <rtl/math.hxx>
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 23e6a44012e4..2717af61e8df 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1399,11 +1399,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
pValue->Value >>= bSelectedFrame;
bGotIsSelectedFrame = sal_True;
}
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsSelectedFrame" ) ) )
- {
- pValue->Value >>= bSelectedFrame;
- bGotIsSelectedFrame = sal_True;
- }
pValue++;
}
if (bGotVisibleBottom)