summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-05-07 18:54:45 +0200
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-05-07 18:54:45 +0200
commita2aabff823450be2c531059f8d8c5d56adcf375a (patch)
tree1d11591062ab06dfeca3a10af513a9d1143fcd33
parentdba9580e6fbe5b72077c2a6c041b39647de9e199 (diff)
parent871e3519d00c1fe77eebe0d42a401851e3fcecb2 (diff)
CWS gnumake2: merging minibranches
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--shell/source/tools/lngconvex/makefile.mk4
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
3 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 8159fc8430..5ffd01cd4a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -463,7 +463,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
{
if ( pControllerItem )
- pControllerItem->isMasterSlaveCommand();
+ return pControllerItem->isMasterSlaveCommand();
return sal_False;
}
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index da28e5ff68..3ee6298e74 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -58,8 +58,8 @@ APP1STDLIBS= $(SALLIB)\
$(I18NISOLANGLIB)
.IF "$(COM)"!="GCC"
-APP1STDLIBS+= $(TOOLSLIBST) \
- msvcprt.lib
+APP1STDLIBS+= msvcprt.lib
+#$(TOOLSLIBST)
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8dda799ab3..21cbe0dcf4 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -55,7 +55,6 @@
#include "boost/scoped_ptr.hpp"
#include "boost/shared_ptr.hpp"
#include "boost/spirit/include/classic_core.hpp"
-#include "bootstrp/sstring.hxx"
#include "com/sun/star/accessibility/AccessibleEventId.hpp"
#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
#include "com/sun/star/accessibility/AccessibleRelationType.hpp"