diff options
92 files changed, 426 insertions, 583 deletions
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 5f606d97ef..61ca79f579 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -1,44 +1,48 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +#************************************************************************* # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. +# This file is part of OpenOffice.org. # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* $(eval $(call gb_AllLangResTarget_AllLangResTarget,sm)) -$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) - $(eval $(call gb_AllLangResTarget_add_srs,sm,\ - starmath/res \ + sm/res \ )) -$(eval $(call gb_SrsTarget_SrsTarget,starmath/res)) +$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) + +$(eval $(call gb_SrsTarget_SrsTarget,sm/res)) -$(eval $(call gb_SrsTarget_set_include,starmath/res,\ +$(eval $(call gb_SrsTarget_set_include,sm/res,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/starmath \ - -I$(realpath $(SRCDIR)/starmath/inc) \ + -I$(SRCDIR)/starmath/inc \ )) -$(eval $(call gb_SrsTarget_add_files,starmath/res,\ - starmath/source/smres.src \ - starmath/source/commands.src \ - starmath/source/symbol.src \ +$(eval $(call gb_SrsTarget_add_files,sm/res,\ + starmath/source/commands.src \ + starmath/source/smres.src \ + starmath/source/symbol.src \ + starmath/source/toolbox.src \ )) diff --git a/starmath/inc/makefile.mk b/starmath/JunitTest_sm_unoapi.mk index 930e5281c6..5e36a7b553 100644 --- a/starmath/inc/makefile.mk +++ b/starmath/JunitTest_sm_unoapi.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -24,24 +24,29 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=starmath -TARGET=inc +$(eval $(call gb_JunitTest_JunitTest,sm_unoapi,SRCDIR)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_JunitTest_add_jars,sm_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- +$(eval $(call gb_JunitTest_add_sourcefiles,sm_unoapi,\ + starmath/qa/unoapi/Test \ +)) -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(eval $(call gb_JunitTest_add_classes,sm_unoapi,\ + org.openoffice.starmath.qa.unoapi.Test \ +)) +# vim: set noet sw=4 ts=4: diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 8bed8a5088..2aef3094c0 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -31,17 +31,10 @@ $(eval $(call gb_Library_set_include,sm,\ -I$(realpath $(SRCDIR)/starmath/inc/pch) \ -I$(realpath $(SRCDIR)/starmath/inc) \ -I$(WORKDIR)/SdiTarget/starmath/sdi \ - -I$(WORKDIR)/Misc/starmath/ \ $$(INCLUDE) \ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,sm,\ - $$(DEFS) \ - -DSMDLL \ - -DSC_INFO_OSVERSION=\"$(OS)\" \ -)) - $(eval $(call gb_Library_add_api,sm,\ offapi \ udkapi \ @@ -64,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ tl \ utl \ vcl \ - ucbhelper \ xo \ )) @@ -85,8 +77,8 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/node \ starmath/source/parse \ starmath/source/rect \ - starmath/source/register \ - starmath/source/smdll \ + starmath/source/register \ + starmath/source/smdll \ starmath/source/smmod \ starmath/source/symbol \ starmath/source/toolbox \ @@ -108,3 +100,5 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ $$(INCLUDE) \ -I$(OUTDIR)/inc \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 4889413660..995cd77c1d 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -1,40 +1,40 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +#************************************************************************* # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. +# This file is part of OpenOffice.org. # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* $(eval $(call gb_Library_Library,smd)) -$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) +$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) $(eval $(call gb_Library_set_include,smd,\ - -I$(realpath $(SRCDIR)/starmath/inc/pch) \ - -I$(realpath $(SRCDIR)/starmath/inc) \ - -I$(WORKDIR)/Misc/sm/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,smd,\ - $$(DEFS) \ + $$(INCLUDE) \ + -I$(SRCDIR)/starmath/inc \ + -I$(SRCDIR)/starmath/inc/pch \ )) $(eval $(call gb_Library_add_api,smd,\ @@ -43,16 +43,17 @@ $(eval $(call gb_Library_add_api,smd,\ )) $(eval $(call gb_Library_add_linked_libs,smd,\ - cppu \ - cppuhelper \ - sal \ - sfx \ - sot \ - svl \ - svt \ - tl \ - ucbhelper \ - vcl \ + cppu \ + cppuhelper \ + sal \ + sfx \ + sot \ + svl \ + svt \ + tl \ + ucbhelper \ + vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,smd,\ @@ -60,3 +61,5 @@ $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/smdetect \ starmath/source/eqnolefilehdr \ )) + +# vim: set noet sw=4 ts=4: diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index c529322339..da3addf98c 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -1,40 +1,41 @@ +#************************************************************************* # -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ +# OpenOffice.org - a multi-platform office productivity suite # -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# This file is part of OpenOffice.org. # -# The Initial Developer of the Original Code is -# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* -$(eval $(call gb_Module_Module,sm)) +$(eval $(call gb_Module_Module,starmath)) -$(eval $(call gb_Module_add_targets,sm,\ - AllLangResTarget_sm \ - Library_sm \ - Library_smd \ - Package_uiconfig \ +$(eval $(call gb_Module_add_targets,starmath,\ + AllLangResTarget_sm \ + Library_sm \ + Library_smd \ + Package_uiconfig \ )) -ifneq ($(OS),OPENBSD) -$(eval $(call gb_Module_add_check_targets,sm,\ - CppunitTest_starmath_qa_cppunit \ +$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\ + JunitTest_sm_unoapi \ )) -endif -$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\ - JunitTest_starmath_unoapi \ -)) +# vim: set noet ts=4 sw=4: diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk index d83485ccf0..d01d857ec1 100644 --- a/starmath/Package_uiconfig.mk +++ b/starmath/Package_uiconfig.mk @@ -1,28 +1,33 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +#************************************************************************* # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. +# This file is part of OpenOffice.org. # -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* -$(eval $(call gb_Package_Package,sm_uiconfig,$(realpath $(SRCDIR)/starmath/uiconfig))) +$(eval $(call gb_Package_Package,sm_uiconfig,$(SRCDIR)/starmath/uiconfig)) $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml)) $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml)) - +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml)) diff --git a/starmath/prj/makefile.mk b/starmath/prj/makefile.mk index e312a7ccab..88cd9dfe08 100644 --- a/starmath/prj/makefile.mk +++ b/starmath/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/starmath/qa/unoapi/Test.java b/starmath/qa/unoapi/Test.java new file mode 100644 index 0000000000..bd2a77d6e0 --- /dev/null +++ b/starmath/qa/unoapi/Test.java @@ -0,0 +1,52 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +package org.openoffice.starmath.qa.unoapi; + +import org.openoffice.Runner; +import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; +import static org.junit.Assert.*; + +public final class Test { + @org.junit.Before public void setUp() throws Exception { + connection.setUp(); + } + + @org.junit.After public void tearDown() + throws InterruptedException, com.sun.star.uno.Exception + { + connection.tearDown(); + } + + @org.junit.Test public void test() { + assertTrue( + Runner.run( + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), + "-cs", connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index d7f6f64422..b3bfd5be61 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx index 1d382b8173..365e50aece 100644 --- a/starmath/source/eqnolefilehdr.hxx +++ b/starmath/source/eqnolefilehdr.hxx @@ -78,7 +78,7 @@ public: } }; -sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); +SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); #endif diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index 7d44e2b981..2fc6dafa0d 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 13f23244f4..ccf23ef65a 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -30,8 +30,6 @@ #include "precompiled_starmath.hxx" #include "smdetect.hxx" - -//#include <framework/interaction.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -46,10 +44,8 @@ #include <com/sun/star/ucb/InteractiveAppException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> - #include <toolkit/helper/vclunohelper.hxx> #include <ucbhelper/simpleinteractionrequest.hxx> - #include <rtl/ustring.h> #include <rtl/logfile.hxx> #include <svl/itemset.hxx> @@ -71,8 +67,8 @@ #include <sfx2/brokenpackageint.hxx> #include "document.hxx" -#include "eqnolefilehdr.hxx" +extern sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 414138ad2e..9b644ceae5 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -557,7 +557,7 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt) aPos = rCEvt.GetMousePosPixel(); OSL_ENSURE( pViewShell, "view shell missing" ); - // added for replaceability of context menus + // added for replaceability of context menus pViewShell->GetViewFrame()->GetBindings().GetDispatcher() ->ExecutePopup( aResId, this, &aPos ); diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src deleted file mode 100644 index 0b2ff54898..0000000000 --- a/starmath/util/hidother.src +++ /dev/null @@ -1,116 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "../inc/helpids.h" - -hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; }; -hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; }; -hidspecial HID_SMA_FONTSIZEDIALOG { HelpId = HID_SMA_FONTSIZEDIALOG; }; -hidspecial HID_SMA_FONTTYPEDIALOG { HelpId = HID_SMA_FONTTYPEDIALOG; }; -hidspecial HID_SMA_DISTANCEDIALOG { HelpId = HID_SMA_DISTANCEDIALOG; }; -hidspecial HID_SMA_ALIGNDIALOG { HelpId = HID_SMA_ALIGNDIALOG; }; -hidspecial HID_SMA_PRINTOPTIONPAGE { HelpId = HID_SMA_PRINTOPTIONPAGE; }; -hidspecial HID_SMA_SYMBOLDIALOG { HelpId = HID_SMA_SYMBOLDIALOG; }; -hidspecial HID_SMA_SYMDEFINEDIALOG { HelpId = HID_SMA_SYMDEFINEDIALOG; }; -hidspecial HID_SMA_EXTRAOPTIONPAGE { HelpId = HID_SMA_EXTRAOPTIONPAGE; }; -hidspecial HID_SMA_DOCSAVEQUERY { HelpId = HID_SMA_DOCSAVEQUERY; }; -hidspecial HID_SMA_OBJECTSAVEQUERY { HelpId = HID_SMA_OBJECTSAVEQUERY; }; -hidspecial HID_SMA_DEFAULTSAVEQUERY { HelpId = HID_SMA_DEFAULTSAVEQUERY; }; -hidspecial HID_SMA_ILLEGALOBJECTERROR { HelpId = HID_SMA_ILLEGALOBJECTERROR; }; -hidspecial HID_SMA_ILLEGALFILEERROR { HelpId = HID_SMA_ILLEGALFILEERROR; }; -hidspecial HID_SMA_WRITESYMBOLERROR { HelpId = HID_SMA_WRITESYMBOLERROR; }; -hidspecial HID_SMA_READSYMBOLERROR { HelpId = HID_SMA_READSYMBOLERROR; }; -hidspecial HID_SMA_NOMATHTYPEFACEWARNING { HelpId = HID_SMA_NOMATHTYPEFACEWARNING; }; -hidspecial HID_SMA_OBJECTNAME { HelpId = HID_SMA_OBJECTNAME; }; -hidspecial HID_SMA_VIEWNAME { HelpId = HID_SMA_VIEWNAME; }; -hidspecial HID_SMA_UNDOEDITNAME { HelpId = HID_SMA_UNDOEDITNAME; }; -hidspecial HID_SMA_UNDOFORMATNAME { HelpId = HID_SMA_UNDOFORMATNAME; }; -hidspecial HID_SMA_APPICO { HelpId = HID_SMA_APPICO; }; -hidspecial HID_SMA_DOCICO { HelpId = HID_SMA_DOCICO; }; -hidspecial HID_SMA_TMPICO { HelpId = HID_SMA_TMPICO; }; -hidspecial HID_SMA_COMMANDMENU { HelpId = HID_SMA_COMMANDMENU; }; -hidspecial HID_SMA_VIEWMENU { HelpId = HID_SMA_VIEWMENU; }; -hidspecial HID_SMA_DISTANCEMENU { HelpId = HID_SMA_DISTANCEMENU; }; -hidspecial HID_SMA_FONTMENU { HelpId = HID_SMA_FONTMENU; }; -hidspecial HID_SMA_STARTUPWINDOW { HelpId = HID_SMA_STARTUPWINDOW; }; -hidspecial HID_SMA_TOOLBOXWINDOW { HelpId = HID_SMA_TOOLBOXWINDOW; }; -hidspecial HID_SMA_CMDBOXWINDOW { HelpId = HID_SMA_CMDBOXWINDOW; }; -hidspecial HID_SMA_UPDATEOBJECT { HelpId = HID_SMA_UPDATEOBJECT; }; -hidspecial HID_SMA_FONTREGULAR { HelpId = HID_SMA_FONTREGULAR; }; -hidspecial HID_SMA_FONTITALIC { HelpId = HID_SMA_FONTITALIC; }; -hidspecial HID_SMA_FONTBOLD { HelpId = HID_SMA_FONTBOLD; }; -hidspecial HID_SMA_PRINTOPTION { HelpId = HID_SMA_PRINTOPTION; }; -hidspecial HID_SMA_DOCUMENTSTR { HelpId = HID_SMA_DOCUMENTSTR; }; -hidspecial HID_SMA_SYMBOLFILESSTR { HelpId = HID_SMA_SYMBOLFILESSTR; }; -hidspecial HID_SMA_ALLFILESSTR { HelpId = HID_SMA_ALLFILESSTR; }; -hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; }; -hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; }; -hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; }; -hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; }; -hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; }; - -hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; }; -hidspecial HID_SMA_LINE_DIST { HelpId = HID_SMA_LINE_DIST; }; -hidspecial HID_SMA_ROOT_DIST { HelpId = HID_SMA_ROOT_DIST; }; -hidspecial HID_SMA_SUP_DIST { HelpId = HID_SMA_SUP_DIST; }; -hidspecial HID_SMA_SUB_DIST { HelpId = HID_SMA_SUB_DIST; }; -hidspecial HID_SMA_NUMERATOR_DIST { HelpId = HID_SMA_NUMERATOR_DIST; }; -hidspecial HID_SMA_DENOMINATOR_DIST { HelpId = HID_SMA_DENOMINATOR_DIST; }; -hidspecial HID_SMA_FRACLINE_EXCWIDTH { HelpId = HID_SMA_FRACLINE_EXCWIDTH; }; -hidspecial HID_SMA_FRACLINE_LINEWIDTH { HelpId = HID_SMA_FRACLINE_LINEWIDTH; }; -hidspecial HID_SMA_UPPERLIMIT_DIST { HelpId = HID_SMA_UPPERLIMIT_DIST; }; -hidspecial HID_SMA_LOWERLIMIT_DIST { HelpId = HID_SMA_LOWERLIMIT_DIST; }; -hidspecial HID_SMA_BRACKET_EXCHEIGHT { HelpId = HID_SMA_BRACKET_EXCHEIGHT; }; -hidspecial HID_SMA_BRACKET_DIST { HelpId = HID_SMA_BRACKET_DIST; }; -hidspecial HID_SMA_BRACKET_EXCHEIGHT2 { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; }; -hidspecial HID_SMA_MATRIXROW_DIST { HelpId = HID_SMA_MATRIXROW_DIST; }; -hidspecial HID_SMA_MATRIXCOL_DIST { HelpId = HID_SMA_MATRIXCOL_DIST; }; -hidspecial HID_SMA_ATTRIBUT_DIST { HelpId = HID_SMA_ATTRIBUT_DIST; }; -hidspecial HID_SMA_INTERATTRIBUT_DIST { HelpId = HID_SMA_INTERATTRIBUT_DIST; }; -hidspecial HID_SMA_OPERATOR_EXCHEIGHT { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; }; -hidspecial HID_SMA_OPERATOR_DIST { HelpId = HID_SMA_OPERATOR_DIST; }; -hidspecial HID_SMA_LEFTBORDER_DIST { HelpId = HID_SMA_LEFTBORDER_DIST; }; -hidspecial HID_SMA_RIGHTBORDER_DIST { HelpId = HID_SMA_RIGHTBORDER_DIST; }; -hidspecial HID_SMA_UPPERBORDER_DIST { HelpId = HID_SMA_UPPERBORDER_DIST; }; -hidspecial HID_SMA_LOWERBORDER_DIST { HelpId = HID_SMA_LOWERBORDER_DIST; }; - -//! this shouldn't have been necessary! -hidspecial HID_SMA_ALEPH { HelpId = HID_SMA_ALEPH; }; -hidspecial HID_SMA_EMPTYSET { HelpId = HID_SMA_EMPTYSET; }; -hidspecial HID_SMA_RE { HelpId = HID_SMA_RE; }; -hidspecial HID_SMA_IM { HelpId = HID_SMA_IM; }; -hidspecial HID_SMA_INFINITY { HelpId = HID_SMA_INFINITY; }; -hidspecial HID_SMA_PARTIAL { HelpId = HID_SMA_PARTIAL; }; -hidspecial HID_SMA_WP { HelpId = HID_SMA_WP; }; -hidspecial HID_SMA_DOTSAXIS { HelpId = HID_SMA_DOTSAXIS; }; -hidspecial HID_SMA_DOTSUP { HelpId = HID_SMA_DOTSUP; }; -hidspecial HID_SMA_DOTSDOWN { HelpId = HID_SMA_DOTSDOWN; }; -hidspecial HID_SMA_DOTSLOW { HelpId = HID_SMA_DOTSLOW; }; -hidspecial HID_SMA_DOTSVERT { HelpId = HID_SMA_DOTSVERT; }; -hidspecial HID_SMA_NABLA { HelpId = HID_SMA_NABLA; }; -hidspecial HID_SMA_EXISTS { HelpId = HID_SMA_EXISTS; }; -hidspecial HID_SMA_FORALL { HelpId = HID_SMA_FORALL; }; - diff --git a/starmath/workben/smath-dump-watch.sh b/starmath/workben/smath-dump-watch.sh index 6ca1b0c703..21ec5f14ad 100755 --- a/starmath/workben/smath-dump-watch.sh +++ b/starmath/workben/smath-dump-watch.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Watches for formula dumps by starmath and renders them +# Watches for formula dumps by starmath and renders them # If starmath is compiled with the macro DEBUG_ENABLE_DUMPASDOT defined. # shift+enter, in the visual formula editor will make starmath dump a # graphviz graph of the formula tree structure. This is very useful when @@ -20,7 +20,7 @@ touch /tmp/smath-dump.gv; while inotifywait -q -e close_write /tmp/smath-dump.gv; do - dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null - kill `pidof -s feh`; > /dev/null - feh /tmp/smath-dump.png & > /dev/null + dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null + kill `pidof -s feh`; > /dev/null + feh /tmp/smath-dump.png & > /dev/null done diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index 0d59a5631a..f740014ef6 100755 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,sw_complex)) +$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,sw_complex,\ $$(DEFS) \ diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk index 8366c20226..d148319a58 100755 --- a/sw/JunitTest_sw_unoapi.mk +++ b/sw/JunitTest_sw_unoapi.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,sw_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\ $$(DEFS) \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 00870e3b91..5ca4115ba6 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,msword,\ -I$(WORKDIR)/inc/sw/sdi \ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ - $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \ -I$(OUTDIR)/inc/sw \ )) @@ -47,10 +46,6 @@ $(eval $(call gb_Library_add_api,msword,\ offapi \ )) -$(eval $(call gb_Library_set_defs,msword,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,msword,\ basegfx \ comphelper \ @@ -59,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ editeng \ i18nisolang1 \ i18nutil \ - icuuc \ msfilter \ sal \ sax \ @@ -80,6 +74,11 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_use_externals,msword,\ + icuuc \ + libxml2 \ +)) + $(eval $(call gb_Library_add_exception_objects,msword,\ sw/source/filter/rtf/rtffld \ sw/source/filter/rtf/rtffly \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 82ea9aa3b3..84471a3bca 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_set_include,sw,\ -I$(WORKDIR)/SdiTarget/sw/sdi \ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ - $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \ -I$(OUTDIR)/inc \ )) @@ -51,8 +50,7 @@ $(eval $(call gb_Library_add_api,sw,\ offapi \ )) -$(eval $(call gb_Library_set_defs,sw,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sw,\ -DSW_DLLIMPLEMENTATION \ )) @@ -66,7 +64,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ editeng \ i18nisolang1 \ i18nutil \ - icuuc \ lng \ sal \ salhelper \ @@ -77,7 +74,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ svt \ svx \ svxcore \ - swd \ + swd \ tk \ tl \ ucbhelper \ @@ -85,10 +82,14 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ vbahelper \ vcl \ xo \ - xml2 \ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_use_externals,sw,\ + icuuc \ + libxml2 \ +)) + $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/SwNumberTree/SwNodeNum \ sw/source/core/SwNumberTree/SwNumberTree \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index b155983399..52988841c6 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -45,8 +45,8 @@ $(eval $(call gb_Library_add_api,swd,\ offapi \ )) -$(eval $(call gb_Library_set_defs,swd,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,swd,\ + -DSWD_DLLIMPLEMENTATION \ -DSWD_DLLIMPLEMENTATION \ )) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 2cdf1b5562..91a89034fb 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -38,10 +38,6 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_defs,swui,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_api,swui,\ udkapi \ offapi \ diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index 913a5a413a..4a1d66fdcc 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -36,7 +36,7 @@ class IDocumentState { public: - /** Must be called manually at changes of format. + /** Must be called manually at changes of format. */ virtual void SetModified() = 0; diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx index 77ea7c9c24..ec469f0665 100644 --- a/sw/inc/IDocumentStylePoolAccess.hxx +++ b/sw/inc/IDocumentStylePoolAccess.hxx @@ -47,24 +47,24 @@ { public: - /** Return "Auto-Collection with ID. + /** Return "Auto-Collection with ID. Create, if it does not yet exist. - If string pointer is defined request only description + If string pointer is defined request only description of attributes, do not create style sheet! */ virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; - /** Return required automatic format base class. + /** Return required automatic format base class. */ virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0; - /** Return required automatic format. + /** Return required automatic format. */ virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0; virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0; - /** Return required automatic page style. + /** Return required automatic page style. */ virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index f527a1a7e1..cdb53b0bf4 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1807,10 +1807,10 @@ public: // If no collection is given, use chapter styles for 1st level. sal_Bool GenerateGlobalDoc( const String& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); + sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); sal_Bool GenerateHTMLDoc( const String& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); + sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); // Compare two documents. long CompareDoc( const SwDoc& rDoc ); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index e40ce153d0..47e3d1ea01 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -398,7 +398,7 @@ public: virtual sal_uInt16 GetSubType() const; - + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 08ec419863..b1ad412019 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -292,7 +292,7 @@ public: inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; - /** SwFmt::IsBackgroundTransparent + /** SwFmt::IsBackgroundTransparent Virtual method to determine, if background of format is transparent. Default implementation returns false. Thus, subclasses have to overload @@ -304,7 +304,7 @@ public: */ virtual sal_Bool IsBackgroundTransparent() const; - /** SwFmt::IsShadowTransparent + /** SwFmt::IsShadowTransparent Virtual method to determine, if shadow of format is transparent. Default implementation returns false. Thus, subclasses have to overload diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 5d2761d42e..5cd6ae7a2a 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -204,7 +204,7 @@ public: */ virtual sal_Bool IsBackgroundTransparent() const; - /** SwFlyFrmFmt::IsBackgroundBrushInherited + /** SwFlyFrmFmt::IsBackgroundBrushInherited Method to determine, if the brush for drawing the background is "inherited" from its parent/grandparent. diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 0358632a4f..7ac99aea44 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -97,13 +97,15 @@ class SwIoSystem { public: // find for an internal format name the corresponding filter entry - SWD_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat, + SWD_DLLPUBLIC static const SfxFilter* + GetFilterOfFormat( const String& rFormat, const SfxFilterContainer* pCnt = 0 ); // Detect for the given file which filter should be used. The filter name // is returned. If no filter could be found, the name of the ASCII filter // is returned! - SWD_DLLPUBLIC static const SfxFilter* GetFileFilter( const String& rFileName, + SWD_DLLPUBLIC static const SfxFilter* + GetFileFilter( const String& rFileName, const String& rPrefFltName, SfxMedium* pMedium = 0 ); @@ -115,12 +117,14 @@ public: static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); - SWD_DLLPUBLIC static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, + SWD_DLLPUBLIC static bool + IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen ); - SWD_DLLPUBLIC static const String GetSubStorageName( const SfxFilter& rFltr ); + SWD_DLLPUBLIC static const String + GetSubStorageName( const SfxFilter& rFltr ); }; #endif diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index dcf69f4481..1ac591510d 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -197,7 +197,7 @@ public: sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; void ReleaseLink(); - // Scale an image-map: the image-map becomes zoomed in / out by + // Scale an image-map: the image-map becomes zoomed in / out by // factor between graphic-size and border-size. void ScaleImageMap(); diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 319102ad92..9a33978f40 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -62,11 +62,11 @@ SW_DLLPRIVATE SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr ); -// Class SwpHints is derived indirectly via SwpHts, because only the +// Class SwpHints is derived indirectly via SwpHts, because only the // class SwTxtNode should be allowed to insert and remove attributes. // Other classes like the Frames are given only reading access via // the index-operator. -// Size when created is 1 because an array is created only if +// Size when created is 1 because an array is created only if // also a hint is inserted. // Class SwpHtStart/End diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 84555e166d..53141d4ee6 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -276,7 +276,7 @@ public: sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const; // Is node in an protected area? sal_Bool IsInProtectSect() const; - // Is node in something that is protected (range, frame, + // Is node in something that is protected (range, frame, // table cells ... including anchor in case of frames or footnotes)? sal_Bool IsProtect() const; @@ -434,7 +434,7 @@ public: // frames are removed from the respective layout. void DelFrms(); - // Returns count of elements of node content. Default is 1. + // Returns count of elements of node content. Default is 1. // There are differences between text node and formula node. virtual xub_StrLen Len() const; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 87f931d2dc..7bda10100e 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -44,7 +44,7 @@ class IntlWrapper; // If SwFmtDrop is a Client, it is the CharFmt that describes the font for the // DropCaps. If it is not a Client, formating uses the CharFmt of the paragraph. -// If the CharFmt is modified, this change is propagated to the paragraphs +// If the CharFmt is modified, this change is propagated to the paragraphs // via the Modify of SwFmtDrop. class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient { diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index f7ecb55fa9..14dc680ec7 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -73,7 +73,7 @@ public: bPrintSingleJobs, bPaperFromSetup, // Print empty pages bPrintEmptyPages, - + // #i56195# no field update while printing mail merge documents bUpdateFieldsInPrinting, bModified; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 4c5c78c930..21aeb984dd 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -170,7 +170,7 @@ class SwReader: public SwDocFac String sBaseURL; public: - + // Initial reading. Document is created only at Read(...) // or in case it is given, into that. // Special case for Load with Sw3Reader. diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx index 7efaf0e791..02aad4af04 100644 --- a/sw/inc/swdbtoolsclient.hxx +++ b/sw/inc/swdbtoolsclient.hxx @@ -33,7 +33,7 @@ #include <osl/module.h> #include "swdllapi.h" -/* +/* Client to use the dbtools library as load-on-call */ class SW_DLLPUBLIC SwDbtoolsClient diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index 70e7b2fbdd..68b29d06f8 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -138,7 +138,7 @@ enum SwUndoId UNDO_CHANGE_PAGEDESC, // 89 UNDO_DELETE_PAGEDESC, // 90 UNDO_HEADER_FOOTER, // 91 #i7983# - UNDO_FIELD, // 92 + UNDO_FIELD, // 92 UNDO_TXTFMTCOL_CREATE, // 93 UNDO_TXTFMTCOL_DELETE, // 94 UNDO_TXTFMTCOL_RENAME, // 95 diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 246c085f3f..b3ec8371d5 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -459,7 +459,7 @@ namespace nsSwTOOElements const SwTOOElements TOO_OTHER = 0x80; } -#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) +#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) /*-------------------------------------------------------------------- Description: Class for all indexes diff --git a/sw/qa/complex/accessibility/makefile.mk b/sw/qa/complex/accessibility/makefile.mk deleted file mode 100644 index 06e7c6a704..0000000000 --- a/sw/qa/complex/accessibility/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_accessibility - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/accessibility -JAVATESTFILES = AccessibleRelationSet.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/qa/complex/checkColor/makefile.mk b/sw/qa/complex/checkColor/makefile.mk deleted file mode 100644 index e5b368083a..0000000000 --- a/sw/qa/complex/checkColor/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_checkColor - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/checkColor -JAVATESTFILES = CheckChangeColor.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index c258ed7f22..46f6c49d64 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -373,7 +373,7 @@ public: bool HasAdditionalAccessibleChildren(); // #i88070# - get additional child by index - Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex ); + Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex ); // #i88070# - get all additional accessible children void GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren ); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 76ca7eb784..30d9d385d9 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -933,7 +933,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, } } - aPosArr.Insert( + aPosArr.Insert( static_cast<sal_uInt16>(aFInfo.GetFrm()->IsVertical() ? aFInfo.GetFrm()->Prt().Bottom() : aFInfo.GetFrm()->Prt().Right()), diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index cb740dfd06..d5280d21c5 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -608,7 +608,7 @@ public: } static void repaintTextFrames( const SwTxtNode& rNode ); - + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); }; diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src index 1c5cafc38c..4b0c4b2df7 100644 --- a/sw/source/core/layout/pagefrm.src +++ b/sw/source/core/layout/pagefrm.src @@ -4,4 +4,3 @@ Bitmap BMP_PAGE_SHADOW_MASK { File = "page-shadow-mask.png"; }; - diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 3eee736a6a..e153ab46f7 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -775,7 +775,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() (pUpperOfOrientFrm->*fnRect->fnGetPrtBottom)() ); if( nDist < 0 ) { - // #i23512# - correction: + // #i23512# - correction: // consider section frame for grow in online layout and // consider page alignment for grow in table. SwLayoutFrm* pLayoutFrmToGrow = 0L; @@ -911,7 +911,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() ? MAKEPAGE_NOSECTION : ( bInFtn ? MAKEPAGE_NONE : MAKEPAGE_APPEND ) ), sal_True, &rAnchorTxtFrm ); - // correction: + // correction: // If anchor is in footnote and proposed next layout environment // isn't a footnote frame, object can't follow the text flow if ( bInFtn && pNextLay && !pNextLay->IsFtnFrm() ) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 73cde7084a..f74d416d9f 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1843,7 +1843,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } SwUnoInternalPaM aPam(*pDoc); - //which must now return sal_True + //which must now return sal_True ::sw::XTextRangeToSwPaM(aPam, xTextRange); SwTOXMark aMark (pTOXType); if (m_pImpl->m_sAltText.getLength()) diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index ab71036c8b..dcc26fb851 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -86,7 +86,7 @@ struct SwTextSectionProperties_Impl ::std::auto_ptr<SvXMLAttrContainerItem> m_pXMLAttr; ::std::auto_ptr<SwFmtNoBalancedColumns> m_pNoBalanceItem; ::std::auto_ptr<SvxFrameDirectionItem> m_pFrameDirItem; - ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem; + ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem; bool m_bDDE; bool m_bHidden; @@ -354,7 +354,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) RES_COL, RES_COL, RES_BACKGROUND, RES_BACKGROUND, RES_FTN_AT_TXTEND, RES_FRAMEDIR, - RES_LR_SPACE, RES_LR_SPACE, + RES_LR_SPACE, RES_LR_SPACE, RES_UNKNOWNATR_CONTAINER,RES_UNKNOWNATR_CONTAINER, 0); if (m_pImpl->m_pProps->m_pBrushItem.get()) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 3794d6e3b0..a0ef41b606 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -2053,7 +2053,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( SwTxtFmtColl &rTxtColl = *((*pColls)[k]); if(rTxtColl.IsDefault()) continue; - if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && + if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && rTxtColl.GetAssignedOutlineStyleLevel() == nIndex && rTxtColl.GetName() != sStyleName ) { @@ -2062,7 +2062,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( else if ( rTxtColl.GetName() == sStyleName ) { rTxtColl.AssignToListLevelOfOutlineStyle( nIndex ); - } + } } } break; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 61ae02304a..b983eaff0c 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -17,7 +17,7 @@ * Portions created by the Initial Developer are Copyright (C) 2010 the * Initial Developer. All Rights Reserved. * - * Contributor(s): + * Contributor(s): * Noel Power <noel.power@novell.com> * * For minor contributions see the git repository. diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 53c7bc8b4e..4540e3ba36 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -79,9 +79,9 @@ #include "envelp.hrc" #include "envimg.hxx" -#define ENV_NEWDOC RET_OK -#define ENV_INSERT RET_USER -#define ENV_CANCEL SHRT_MAX +#define ENV_NEWDOC RET_OK +#define ENV_INSERT RET_USER +#define ENV_CANCEL SHRT_MAX // Function used for labels and envelopes in applab.cxx and appenv.cxx @@ -138,7 +138,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText } rSh.InsertLineBreak(); } - rSh.DelLeft(); // Again remove last linebreak + rSh.DelLeft(); // Again remove last linebreak return sRet; } @@ -156,15 +156,15 @@ void SwModule::InsertEnv( SfxRequest& rReq ) { static sal_uInt16 nTitleNo = 0; - SwDocShell *pMyDocSh; - SfxViewFrame *pFrame; + SwDocShell *pMyDocSh; + SfxViewFrame *pFrame; SwView *pNewView; - SwWrtShell *pOldSh, + SwWrtShell *pOldSh, *pSh; // Get current shell pMyDocSh = (SwDocShell*) SfxObjectShell::Current(); - pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0; + pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0; // Create new document (don't show!) SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) ); @@ -349,7 +349,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) Printer *pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( true ); - // Borders (are put together by Shift-Offset and alignment) + // Borders (are put together by Shift-Offset and alignment) Size aPaperSize = pPrt->PixelToLogic( pPrt->GetPaperSizePixel(), MAP_TWIP); if ( !aPaperSize.Width() && !aPaperSize.Height() ) @@ -505,7 +505,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) rReq.Done(); } - else // Abort + else // Abort { rReq.Ignore(); diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 94f466981a..35432155ef 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -121,7 +121,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) switch (nWhich) { case SID_STYLE_APPLY: - {// here the template and its family are passed to the StyleBox + {// here the template and its family are passed to the StyleBox // so that this family is being showed if(pShell->IsFrmSelected()) { @@ -262,7 +262,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) /*-------------------------------------------------------------------- - Description: evaluate StyleSheet-Requests + Description: evaluate StyleSheet-Requests --------------------------------------------------------------------*/ @@ -643,7 +643,7 @@ sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uIn } if (!bBasic) { - // prior to the dialog the HtmlMode at the DocShell is being sunk + // prior to the dialog the HtmlMode at the DocShell is being sunk sal_uInt16 nHtmlMode = ::GetHtmlMode(this); // In HTML mode, we do not always have a printer. In order to show @@ -670,7 +670,7 @@ sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uIn { GetWrtShell()->StartAllAction(); - // newly set the mask only with paragraph-templates + // newly set the mask only with paragraph-templates if( bNew ) { nRet = SFX_STYLE_FAMILY_PARA == pStyle->GetFamily() @@ -1022,7 +1022,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr { pCurrWrtShell->StartAllAction(); pCurrWrtShell->FillByEx(pChar); - // also apply template to remove hard set attributes + // also apply template to remove hard set attributes pCurrWrtShell->EndAllAction(); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 0864d356ca..da8c0e39c6 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1679,7 +1679,7 @@ void SwMarkPreview::Paint(const Rectangle &/*rRect*/) void SwMarkPreview::PaintPage(const Rectangle &rRect) { - // draw PrintArea + // draw PrintArea DrawRect(rRect, m_aTransCol, m_aPrintAreaCol ); // draw Testparagraph @@ -1699,7 +1699,7 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect) nStep = aTextLine.GetHeight() + 2; nLines = (sal_uInt16)(rRect.GetHeight() / (aTextLine.GetHeight() + 2)) - 1; - // simulate text + // simulate text for (sal_uInt16 i = 0; i < nLines; ++i) { if (i == (nLines - 1)) diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index ae96f2ae6f..ac139fce27 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -39,7 +39,7 @@ #include <tools/resid.hxx> #include <fmtornt.hxx> -#include <swtypes.hxx> // empty string +#include <swtypes.hxx> // empty string #include <wrtsh.hxx> #include <uinums.hxx> #include <poolfmt.hxx> @@ -51,12 +51,12 @@ using namespace ::com::sun::star; -#define VERSION_30B ((sal_uInt16)250) -#define VERSION_31B ((sal_uInt16)326) -#define VERSION_40A ((sal_uInt16)364) +#define VERSION_30B ((sal_uInt16)250) +#define VERSION_31B ((sal_uInt16)326) +#define VERSION_40A ((sal_uInt16)364) #define VERSION_50A ((sal_uInt16)373) #define VERSION_53A ((sal_uInt16)596) -#define ACT_NUM_VERSION VERSION_53A +#define ACT_NUM_VERSION VERSION_53A #define NUMRULE_FILENAME "numrule.cfg" #define CHAPTER_FILENAME "chapter.cfg" @@ -67,9 +67,9 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* ) // SwNumRulesWithName ---------------------------------------------------- // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ - Description: Saving a rule - Parameter: rCopy -- the rule to save - nIdx -- position, where the rule is to be saved. + Description: Saving a rule + Parameter: rCopy -- the rule to save + nIdx -- position, where the rule is to be saved. An old rule at that position will be overwritten. ------------------------------------------------------------------------*/ @@ -145,7 +145,7 @@ sal_Bool SwBaseNumRules::Store(SvStream &rStream) int SwBaseNumRules::Load(SvStream &rStream) { - int rc = 0; + int rc = 0; rStream >> nVersion; @@ -339,48 +339,48 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_Bool bFlag; String sStr; - rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); + rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); if( VERSION_53A > nVersion ) { - rStream >> cChar; aFmt.SetBulletChar( cChar ); + rStream >> cChar; aFmt.SetBulletChar( cChar ); } else { - rStream >> nUS; aFmt.SetBulletChar( nUS ); + rStream >> nUS; aFmt.SetBulletChar( nUS ); } - rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); + rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); if( VERSION_30B == nVersion ) { long nL; - rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); + rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nL; aFmt.SetLSpace( lNumIndent ); - rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nL; aFmt.SetLSpace( lNumIndent ); + rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); } - else // old start-value was a Byte + else // old start-value was a Byte { short nShort; - rStream >> nUS; aFmt.SetStart( nUS ); + rStream >> nUS; aFmt.SetStart( nUS ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nUS; aFmt.SetAbsLSpace( nUS ); - rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); - rStream >> nUS; aFmt.SetCharTextDistance( nUS ); - rStream >> nShort; aFmt.SetLSpace( nShort ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nUS; aFmt.SetAbsLSpace( nUS ); + rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); + rStream >> nUS; aFmt.SetCharTextDistance( nUS ); + rStream >> nShort; aFmt.SetLSpace( nShort ); rStream >> bFlag; } - sal_uInt16 nFamily; + sal_uInt16 nFamily; sal_uInt16 nCharSet; short nWidth; short nHeight; @@ -567,7 +567,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh, else pFmt = rSh.GetCharFmtFromPool( nCharPoolId ); - if( !pFmt->GetDepends() ) // set attributes + if( !pFmt->GetDepends() ) // set attributes for( sal_uInt16 n = aItems.Count(); n; ) pFmt->SetFmtAttr( *aItems[ --n ] ); } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index dab975dd74..1f4a398b7f 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -268,7 +268,7 @@ inline sal_Bool IsMinMove(const Point &rStartPos, const Point &rLPt) } /*-------------------------------------------------------------------- - for MouseButtonDown - determine whether a DrawObject + for MouseButtonDown - determine whether a DrawObject an NO SwgFrame was hit! Shift/Ctrl should only result in selecting, with DrawObjects; at SwgFlys to trigger hyperlinks if applicable (DownLoad/NewWindow!) @@ -1269,7 +1269,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) SfxObjectShell *pObjSh = (SfxObjectShell*)rView.GetViewFrame()->GetObjectShell(); if ( bLockInput || (pObjSh && pObjSh->GetProgress()) ) - // When the progress bar is active or a progress is + // When the progress bar is active or a progress is // running on a document, no order is being taken return; @@ -2257,7 +2257,7 @@ KEYINPUT_CHECKTABLE_INSDEL: if( bChkInsBlank && bIsNormalChar && (aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() )) { - // insert a blank ahead of the character. this ends up + // insert a blank ahead of the character. this ends up // between the expanded text and the new "non-word-seperator". aInBuffer.Expand( aInBuffer.Len() + 1, ' ' ); } @@ -2939,7 +2939,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) if( !bSelObj ) { - // move cursor here so that it is not drawn in the + // move cursor here so that it is not drawn in the // frame first; ShowCrsr() happens in LeaveSelFrmMode() bValidCrsrPos = !(CRSR_POSCHG & (rSh.*rSh.fnSetCrsr)(&aDocPos,sal_False)); rSh.LeaveSelFrmMode(); @@ -3248,7 +3248,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) } if ( !rSh.IsExtMode() ) { - // don't start a selection when an + // don't start a selection when an // URL field or a graphic is clicked sal_Bool bSttSelect = rSh.HasSelection() || Pointer(POINTER_REFHAND) != GetPointer(); @@ -4394,7 +4394,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) } ReleaseMouse(); - // Only processed MouseEvents arrive here; only at these the moduses can + // Only processed MouseEvents arrive here; only at these the moduses can // be resetted. bMBPressed = sal_False; diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index a7fefac00f..bfbf1be1fe 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -523,7 +523,7 @@ void SwEditWin::Paint(const Rectangle& rRect) else if( rRect.IsOver( aRect )) { // resides somewhat above, then everything is clipped outside - // and we have to make the "inner part" at the end of the + // and we have to make the "inner part" at the end of the // Paint visible again. Otherwise Paint errors occur! bPaintShadowCrsr = sal_True; } diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index ccac547822..bf0532b045 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -186,8 +186,8 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) { case DATACHANGED_SETTINGS: // rearrange ScrollBars, respectively trigger resize, because - // the ScrollBar size can have change. For that, in the reset - // handler, the size of the ScrollBars also has to be queried + // the ScrollBar size can have change. For that, in the reset + // handler, the size of the ScrollBars also has to be queried // from the settings. if( rDCEvt.GetFlags() & SETTINGS_STYLE ) { diff --git a/sw/source/ui/docvw/extedit.cxx b/sw/source/ui/docvw/extedit.cxx index cf5236c5e9..8010a9d1d1 100644 --- a/sw/source/ui/docvw/extedit.cxx +++ b/sw/source/ui/docvw/extedit.cxx @@ -75,7 +75,7 @@ IMPL_LINK (ExternalProcessClass_Impl, StartListeningEvent, void*, pEvent) String aURL( pData->fileName ); new FileChangedChecker( - pData->fileName, + pData->fileName, ::boost::bind(&HandleCloseEvent,aURL,pData->rSh)); return 0; diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 9bc0d1ae78..3c42717bfe 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -263,7 +263,7 @@ void SwSrcEditWindow::DataChanged( const DataChangedEvent& rDCEvt ) switch ( rDCEvt.GetType() ) { case DATACHANGED_SETTINGS: - // newly rearrange ScrollBars or trigger Resize, because + // newly rearrange ScrollBars or trigger Resize, because // ScrollBar size could have changed. For this, in the // Resize handler the size of ScrollBars has to be queried // from the settings as well. diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index cda3fded49..914c280f50 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -105,7 +105,7 @@ void SwEnvPreview::Paint(const Rectangle &) SetLineColor( aFront ); - // Envelope + // Envelope long nW = (sal_uInt16) (f * nPageW), nH = (sal_uInt16) (f * nPageH), nX = (GetOutputSizePixel().Width () - nW) / 2, diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index a670927baf..5d5bceee57 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -140,12 +140,12 @@ void SwLabPreview::Paint(const Rectangle &) else lDispH += ROUND(aItem.lVDist / 10); - // Scale factor + // Scale factor float fx = (float) lOutWPix23 / Max(1L, lDispW), fy = (float) lOutHPix23 / Max(1L, lDispH), f = fx < fy ? fx : fy; - // zero point + // zero point long lOutlineW = ROUND(f * lDispW); long lOutlineH = ROUND(f * lDispH); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 63305862d3..272bf19b49 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -203,7 +203,7 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) } /*-------------------------------------------------------------------- - Description: destroy dialog + Description: destroy dialog --------------------------------------------------------------------*/ SwChangeDBDlg::~SwChangeDBDlg() { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 9c74cb36a8..79b45be116 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -86,7 +86,7 @@ SwFldDBPage::~SwFldDBPage() } /*-------------------------------------------------------------------- - Description: initialise TabPage + Description: initialise TabPage --------------------------------------------------------------------*/ void SwFldDBPage::Reset(const SfxItemSet&) { @@ -102,7 +102,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) if (!IsFldEdit()) { - // initialise TypeListBox + // initialise TypeListBox const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); for(i = rRg.nStart; i < rRg.nEnd; ++i) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index f1a15f6392..2a18e114df 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -103,7 +103,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) { Init(); // general initialisation - // initialise TypeListBox + // initialise TypeListBox aTypeTLB.SetUpdateMode(sal_False); aTypeTLB.Clear(); pSelEntry = 0; @@ -219,7 +219,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) { - // save old ListBoxPos + // save old ListBoxPos SvLBoxEntry* pOldEntry = pSelEntry; // current ListBoxPos @@ -377,7 +377,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) sal_uInt16 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) { - // fill Format-Listbox + // fill Format-Listbox sal_uInt16 nTypeId = TYP_DOCINFOFLD; EnableInsert(nSubType != USHRT_MAX); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 5a2337a26f..ea9f15ba23 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -93,9 +93,9 @@ SwFldDokPage::~SwFldDokPage() void SwFldDokPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); - Init(); // general initialisation + Init(); // general initialisation - // initialise TypeListBox + // initialise TypeListBox const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); aTypeLB.SetUpdateMode(sal_False); @@ -106,7 +106,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) { - // fill Type-Listbox + // fill Type-Listbox for(short i = rRg.nStart; i < rRg.nEnd; ++i) { nTypeId = GetFldMgr().GetTypeId(i); @@ -194,7 +194,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) { - // save old ListBoxPos + // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); // current ListBoxPos @@ -212,7 +212,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - // fill Selection-Listbox + // fill Selection-Listbox aSelectionLB.Clear(); if (nTypeId != USHRT_MAX) @@ -304,7 +304,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) aSelectionLB.Enable( bEnable ); aSelectionFT.Enable( bEnable ); - // fill Format-Listbox + // fill Format-Listbox sal_uInt16 nSize = FillFormatLB(nTypeId); sal_Bool bValue = sal_False, bLevel = sal_False, bNumFmt = sal_False, bOffset = sal_False; @@ -332,7 +332,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) nFmtType = NUMBERFORMAT_TIME; aValueFT.SetText(sTimeOffset); - aDateOffsetED.SetFirst(-1440); // one day + aDateOffsetED.SetFirst(-1440); // one day aDateOffsetED.SetLast(1440); if (IsFldEdit()) @@ -488,7 +488,7 @@ IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) sal_uInt16 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId) { - // fill Format-Listbox + // fill Format-Listbox aFormatLB.Clear(); if (nTypeId == TYP_AUTHORFLD) diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 9556f71b41..41d0c6ce38 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -94,9 +94,9 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : GetOKButton()->SetClickHdl(LINK(this, SwFldEditDlg, OKHdl)); - // position buttons ourselves because otherwise when font sizes are + // position buttons ourselves because otherwise when font sizes are // varying, they are in the woods, and because PB uses fixed pixel sizes - // for its buttons and dialog width in SingleTabDlg. + // for its buttons and dialog width in SingleTabDlg. aPrevBT.SetPosPixel(Point(GetOKButton()->GetPosPixel().X(), aPrevBT.GetPosPixel().Y())); sal_uInt16 nWidth = static_cast< sal_uInt16 >(GetOKButton()->GetOutputSize().Width() / 2 - 3); Size aNewSize(LogicToPixel(Size(nWidth, GetOKButton()->GetOutputSize().Height()))); @@ -162,7 +162,7 @@ void SwFldEditDlg::Init() SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) { - // create TabPage + // create TabPage SfxTabPage* pTabPage = 0; const char* pHelpId = 0; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 46a3e5849f..f4041d5424 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -116,10 +116,10 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) { - // initialise TypeListBox + // initialise TypeListBox const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); - // fill Typ-Listbox + // fill Typ-Listbox for(short i = rRg.nStart; i < rRg.nEnd; ++i) { nTypeId = GetFldMgr().GetTypeId(i); @@ -193,7 +193,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) { - // save old ListBoxPos + // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); // current ListBoxPos @@ -209,10 +209,10 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - // fill Selection-Listbox + // fill Selection-Listbox UpdateSubType(); - // fill Format-Listbox + // fill Format-Listbox aFormatLB.Clear(); sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); @@ -498,7 +498,7 @@ void SwFldFuncPage::UpdateSubType() { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - // fill Selction-Listbox + // fill Selction-Listbox aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); @@ -539,7 +539,7 @@ void SwFldFuncPage::UpdateSubType() } /*-------------------------------------------------------------------- - Description: call MacroBrowser, fill Listbox with Macros + Description: call MacroBrowser, fill Listbox with Macros --------------------------------------------------------------------*/ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) { @@ -629,7 +629,7 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro) { if (rMacro.Len()) { - // reverse content of aName + // reverse content of aName String sTmp, sBuf; sal_uInt16 nPos = 0; diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 0f712c5fb2..7bfa47e7ee 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -82,7 +82,7 @@ class SwFldFuncPage : public SwFldPage DECL_LINK( ListModifyHdl, Control*); DECL_LINK( ListEnableHdl, void*); - // select Macro + // select Macro DECL_LINK( MacroHdl, Button * ); void UpdateSubType(); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 1923d92efa..2e663854cf 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -62,7 +62,7 @@ #include <view.hxx> #include <wrtsh.hxx> // active window #include <doc.hxx> // active window -#include <docsh.hxx> // active window +#include <docsh.hxx> // active window #include <swmodule.hxx> #include <charatr.hxx> #include <fmtinfmt.hxx> @@ -356,7 +356,7 @@ SwField* SwFldMgr::GetCurFld() if(!pCurFld) return 0; - // preprocess current values; determine parameter 1 and parameter 2 + // preprocess current values; determine parameter 1 and parameter 2 // as well as the format const sal_uInt16 nTypeId = pCurFld->GetTypeId(); @@ -410,7 +410,7 @@ static SwFldGroupRgn const aWebRanges[] = } /*-------------------------------------------------------------------- - Description: determine GroupId + Description: determine GroupId --------------------------------------------------------------------*/ sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const @@ -440,7 +440,7 @@ sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 } /*-------------------------------------------------------------------- - Description: determine names to TypeId + Description: determine names to TypeId ACCESS over TYP_.... --------------------------------------------------------------------*/ @@ -605,7 +605,7 @@ sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, SvStringsDtor& rToFill) } /*-------------------------------------------------------------------- - Description: determine format + Description: determine format ACCESS over TYP_.... --------------------------------------------------------------------*/ @@ -682,7 +682,7 @@ String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const nStart = aSwFlds[nPos].nFmtBegin; if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId) - nFormatId &= ~FF_FIXED; // mask out Fixed-Flag + nFormatId &= ~FF_FIXED; // mask out Fixed-Flag if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd) aRet = SW_RESSTR((sal_uInt16)(nStart + nFormatId)); @@ -714,7 +714,7 @@ String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const } /*-------------------------------------------------------------------- - Description: determine FormatId from Pseudo-ID + Description: determine FormatId from Pseudo-ID --------------------------------------------------------------------*/ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const @@ -836,7 +836,7 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) } /*-------------------------------------------------------------------- - Description: determine current TypeId + Description: determine current TypeId --------------------------------------------------------------------*/ @@ -1552,7 +1552,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, } // set format - // setup format before SetPar2 because of NumberFormatter! + // setup format before SetPar2 because of NumberFormatter! pTmpFld->ChangeFormat(nFormat); if(bSetPar1) @@ -1581,7 +1581,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, } /*-------------------------------------------------------------------- - Description: explicitly evaluate ExpressionFields + Description: explicitly evaluate ExpressionFields --------------------------------------------------------------------*/ void SwFldMgr::EvalExpFlds(SwWrtShell* pSh) { diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index aaa9c1dc63..cc491517c9 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -80,7 +80,7 @@ SwFldPage::~SwFldPage() } /*-------------------------------------------------------------------- - Description: initialise TabPage + Description: initialise TabPage --------------------------------------------------------------------*/ void SwFldPage::Init() @@ -362,7 +362,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) } /*-------------------------------------------------------------------- - Description: enable/disable "Insert"-Button + Description: enable/disable "Insert"-Button --------------------------------------------------------------------*/ void SwFldPage::EnableInsert(sal_Bool bEnable) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 54957cf39d..51a0e37322 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -176,11 +176,11 @@ void SwFldRefPage::Reset(const SfxItemSet& ) SetTypeSel(LISTBOX_ENTRY_NOTFOUND); Init(); // general initialisation - // initialise TypeListBox + // initialise TypeListBox aTypeLB.SetUpdateMode(sal_False); aTypeLB.Clear(); - // fill Type-Listbox + // fill Type-Listbox sal_uInt16 nPos; // set/insert reference @@ -281,7 +281,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) { - // save old ListBoxPos + // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); // current ListBoxPos @@ -362,7 +362,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - // fill selection-ListBox + // fill selection-ListBox UpdateSubType(); sal_Bool bName = sal_False; nFldDlgFmtSel = 0; @@ -404,7 +404,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) aNameED.Enable(bName); aNameFT.Enable(bName); - // fill Format-Listbox + // fill Format-Listbox sal_uInt16 nSize = FillFormatLB(nTypeId); sal_Bool bFormat = nSize != 0; aFormatLB.Enable(bFormat); @@ -465,7 +465,7 @@ IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG ) } /*-------------------------------------------------------------------- - Description: renew types in SelectionLB + Description: renew types in SelectionLB --------------------------------------------------------------------*/ void SwFldRefPage::UpdateSubType() @@ -690,7 +690,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) if (nFormatSel != LISTBOX_ENTRY_NOTFOUND) sOldSel = aFormatLB.GetEntry(nFormatSel); - // fill Format-Listbox + // fill Format-Listbox aFormatLB.Clear(); // refernce has less that the annotation diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 1a6f5edb25..95a8db377d 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -152,7 +152,7 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) if ( GetStyle() & WB_SIZEABLE ) SetSizePixel( pInfo->aSize ); - // remember initial size from pInfo + // remember initial size from pInfo aSize = GetSizePixel(); // should the FloatingWindow get zoomed? diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index e743d8b23e..15c71fc353 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -114,7 +114,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) { - // initialise TypeListBox + // initialise TypeListBox const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); for (short i = rRg.nStart; i < rRg.nEnd; ++i) @@ -144,7 +144,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) } } - // select old Pos + // select old Pos RestorePos(&aTypeLB); aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl)); @@ -196,7 +196,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) { - // save old ListBoxPos + // save old ListBoxPos const sal_uInt16 nOld = GetTypeSel(); // current ListBoxPos @@ -589,7 +589,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } /*-------------------------------------------------------------------- - Description: renew types in SelectionBox + Description: renew types in SelectionBox --------------------------------------------------------------------*/ void SwFldVarPage::UpdateSubType() { @@ -600,7 +600,7 @@ void SwFldVarPage::UpdateSubType() if(GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND) sOldSel = aSelectionLB.GetEntry(GetSelectionSel()); - // fill Selection-Listbox + // fill Selection-Listbox aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); @@ -710,7 +710,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) nOldNumFormat = aNumFormatLB.GetFormat(); } - // fill Format-Listbox + // fill Format-Listbox aFormatLB.Clear(); aNumFormatLB.Clear(); sal_Bool bSpecialFmt = sal_False; @@ -848,13 +848,13 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) nLen = sName.Len(); Selection aSel(aNameED.GetSelection()); aNameED.SetText( sName ); - aNameED.SetSelection( aSel ); // restore Cursorpos + aNameED.SetSelection( aSel ); // restore Cursorpos } break; } - // check buttons + // check buttons switch (nTypeId) { case TYP_DDEFLD: @@ -1026,7 +1026,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) sal_uLong nFmt = nNumFormatPos == 0 ? 0 : aNumFormatLB.GetFormat(); if (nFmt) { // Switch language to office-language because Kalkulator expects - // String in office format and it should be fed into dialog like + // String in office format and it should be fed into dialog like // that nFmt = SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nFmt); } @@ -1151,7 +1151,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) if (nFormat && nFormat != ULONG_MAX && aNumFormatLB.IsAutomaticLanguage()) { // Switch language to office language because Kalkulator expects - // String in office format and it should be fed into the dialog + // String in office format and it should be fed into the dialog // like that SwWrtShell *pSh = GetWrtShell(); if(!pSh) diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 4ca45675b4..786e9b874a 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -52,7 +52,7 @@ class SelectionListBox : public ListBox public: SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ); - // detect selection via Ctrl or Alt and evaluate with SelectHdl + // detect selection via Ctrl or Alt and evaluate with SelectHdl sal_Bool IsCallAddSelection() const {return bCallAddSelection;} void ResetCallAddSelection() {bCallAddSelection = sal_False;} }; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 57cbfe3543..96492f6e50 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -641,7 +641,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Description: create TabPage + Description: create TabPage --------------------------------------------------------------------*/ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) { @@ -687,7 +687,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ ) long nGutterWidth = pColMgr->GetGutterWidth(); if(nCols > 1) { - // Determine whether the most narrow column is too narrow + // Determine whether the most narrow column is too narrow // for the adjusted column gap long nMin = nColWidth[0]; sal_uInt16 i; @@ -981,7 +981,7 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF ) the column gap. These changes take effect time-displaced. With an alteration of the column width the automatic calculation - of the column width is overruled; only an alteration + of the column width is overruled; only an alteration of the column number leads back to that default. ------------------------------------------------------------------------*/ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld ) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 793654a271..496c5c3522 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1306,7 +1306,7 @@ sal_uInt16 SwFrmPage::FillPosLB(const FrmMap* _pMap, ? 0L : ::lcl_GetLBRelationsForRelations( _nRel ); - // fill Listbox + // fill Listbox size_t nCount = ::lcl_GetFrmMapCount(_pMap); for (size_t i = 0; _pMap && i < nCount; ++i) { @@ -2137,7 +2137,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) if (!bReset) { // values was changed by circulation-Tabpage and - // has to be set with Modify-Flag + // has to be set with Modify-Flag aHeightED.SetUserValue(nHeight, FUNIT_TWIP); } else @@ -2171,7 +2171,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) else aAutoHeightCB.Hide(); - // organise circulation-gap for character bound frames + // organise circulation-gap for character bound frames const SvxULSpaceItem &rUL = (const SvxULSpaceItem &)rSet.Get(RES_UL_SPACE); nUpperBorder = rUL.GetUpper(); nLowerBorder = rUL.GetLower(); @@ -2223,7 +2223,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) rVert.GetPos()); } - // transparent for example + // transparent for example // circulation for example const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet.Get(RES_SURROUND); aExampleWN.SetWrap ( static_cast< sal_uInt16 >(rSurround.GetSurround()) ); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 3f254104c2..abe0ad7db5 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -73,7 +73,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Boo pWrtShell(pSh) { - // create TabPage + // create TabPage SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(this, rSet); pNewPage->SetFormatUsed(sal_False, bDrawMode); pNewPage->SetShell(pWrtShell); @@ -286,7 +286,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) WrapTypeHdl(pBtn); // For character objects that currently are in passage, the default // "contour on" is prepared here, in case we switch to any other - // passage later. + // passage later. if (bDrawMode && !aWrapOutlineCB.IsEnabled()) aWrapOutlineCB.Check(); } diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index e653ac10d9..a7ca84f7b0 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -99,7 +99,7 @@ friend void PageNumNotify( ViewShell* pVwSh, Point aRszMvHdlPt; Timer aTemplateTimer; - // type/object where the mouse pointer is + // type/object where the mouse pointer is SwCallMouseEvent aSaveCallEvent; SwApplyTemplate *pApplyTempl; @@ -169,7 +169,7 @@ friend void PageNumNotify( ViewShell* pVwSh, /* * handler for scrolling on when the mousepointer * stopps outside of EditWin during a drag-operation. - * The selection is regularly increased towards the mouse + * The selection is regularly increased towards the mouse * position. */ DECL_LINK( TimerHandler, Timer * ); @@ -234,7 +234,7 @@ public: sal_Bool IsFrmAction() { return (bInsFrm); } inline sal_uInt16 GetBezierMode() { return eBezierMode; } void SetBezierMode(sal_uInt16 eBezMode) { eBezierMode = eBezMode; } - void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode + void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode void InsFrm(sal_uInt16 nCols); void StopInsFrm(); sal_uInt16 GetFrmColCount() const {return nInsFrmColCount;} // column number for interactive frame diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index ca89df401a..52c8eff852 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -74,7 +74,7 @@ struct SwFldGroupRgn }; /*-------------------------------------------------------------------- - Description: the field manager handles the insertation of fields + Description: the field manager handles the insertation of fields with command strings --------------------------------------------------------------------*/ struct SwInsertFld_Data @@ -175,7 +175,7 @@ public: sal_Bool IsDBNumeric(const String& rDBName, const String& rTblQryName, sal_Bool bIsTable, const String& rFldName); - // organise RefMark with names + // organise RefMark with names sal_Bool CanInsertRefMark( const String& rStr ); diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index d55140b02f..af4049727b 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -37,7 +37,7 @@ /* --- class SwParagraphNumTabPage ---------------------------------------- - with this TabPage numbering settings at the paragraph / paragraph style + with this TabPage numbering settings at the paragraph / paragraph style are performed. ---------------------------------------------------------------------------*/ diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 7f90b5af98..d9c44363b7 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -95,7 +95,7 @@ public: }; /*-------------------------------------------------------- - TabPage printer settings additions + TabPage printer settings additions --------------------------------------------------------- */ class SwAddPrinterTabPage : public SfxTabPage { diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx index 990f5e1e10..c419776854 100644 --- a/sw/source/ui/inc/toxmgr.hxx +++ b/sw/source/ui/inc/toxmgr.hxx @@ -292,7 +292,7 @@ public: void NextTOXMark(sal_Bool bSame=sal_False); void PrevTOXMark(sal_Bool bSame=sal_False); - // get current TOXmarks + // get current TOXmarks sal_uInt16 GetTOXMarks(); sal_uInt16 GetTOXMarkCount(); SwTOXMark* GetTOXMark(sal_uInt16 nId); diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index 53668f82b5..9a1304aa7a 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -49,7 +49,7 @@ class SfxViewFrame; // switch a metric SW_DLLPUBLIC void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit); -// fill BoxInfoAttribut +// fill BoxInfoAttribut SW_DLLPUBLIC void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh); // SfxItemSets <-> PageDesc diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d73c9f3ad5..6c7828b3ee 100755 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -219,7 +219,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *pHScrollbar, // MDI control elements + SwScrollbar *pHScrollbar, // MDI control elements *pVScrollbar; Window *pScrollFill; // dummy window for filling the lower right edge @@ -600,7 +600,7 @@ public: String GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr); - // hand over Shell + // hand over Shell SfxShell *GetCurShell() { return pShell; } SwDocShell *GetDocShell(); inline const SwDocShell *GetDocShell() const; diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 92c5d54862..ebed5eedc0 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -248,7 +248,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // set the cursor to page "nPage" at the beginning // additionally to a identically named implementation in crsrsh.hxx - // here all existing selections are being reset before setting the + // here all existing selections are being reset before setting the // cursor sal_Bool GotoPage( sal_uInt16 nPage, sal_Bool bRecord ); @@ -573,7 +573,7 @@ private: sal_Bool bSelWrd :1; sal_Bool bSelLn :1; sal_Bool bIsInClickToEdit:1; - sal_Bool bClearMark :1; // don't delete selection for ChartAutoPilot + sal_Bool bClearMark :1; // don't delete selection for ChartAutoPilot sal_Bool mbRetainSelection :1; // Do not remove selections Point aStart; @@ -581,7 +581,7 @@ private: SELECTFUNC fnLeaveSelect; - // resets the cursor stack after movement by PageUp/-Down + // resets the cursor stack after movement by PageUp/-Down SW_DLLPRIVATE void _ResetCursorStack(); SW_DLLPRIVATE void SttDragDrop(Timer *); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index eff56e7e26..16042cf5d1 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3967,7 +3967,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId, ////////////////////////////////////////////////////////////////////// // HACK: BrowseBox doesn't invalidate its childs, how it should be. - // That's why WB_CLIPCHILDREN is reset in order to enforce the + // That's why WB_CLIPCHILDREN is reset in order to enforce the // childs' invalidation WinBits aStyle = GetStyle(); if( aStyle & WB_CLIPCHILDREN ) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index b3a8e5bb24..de17942afd 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -232,7 +232,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, void SwIndexMarkDlg::InitControls() { OSL_ENSURE(pSh && pTOXMgr, "no shell?"); - // contents index + // contents index const SwTOXType* pType = pTOXMgr->GetTOXType(TOX_CONTENT, 0); OSL_ENSURE(pType, "Kein Verzeichnistyp !!"); String sTmpTypeSelection; @@ -265,7 +265,7 @@ void SwIndexMarkDlg::InitControls() UpdateLanguageDependenciesForPhoneticReading(); - // current entry + // current entry const SwTOXMark* pMark = pTOXMgr->GetCurTOXMark(); if( pMark && !bNewMark) { @@ -324,7 +324,7 @@ void SwIndexMarkDlg::InitControls() aOrgStr = pSh->GetView().GetSelectionTextParam(sal_True, sal_False); aEntryED.SetText(aOrgStr); - //to include all equal entries may only be allowed in the body and even there + //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists const sal_uInt16 nFrmType = pSh->GetFrmType(0,sal_True); aApplyToAllCB.Show(); @@ -417,7 +417,7 @@ void SwIndexMarkDlg::Activate() aOrgStr = pSh->GetView().GetSelectionTextParam(sal_True, sal_False); aEntryED.SetText(aOrgStr); - //to include all equal entries may only be allowed in the body and even there + //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists const sal_uInt16 nFrmType = pSh->GetFrmType(0,sal_True); aApplyToAllCB.Show(); @@ -432,7 +432,7 @@ void SwIndexMarkDlg::Activate() } /*-------------------------------------------------------------------- - Description: evaluate Ok-Button + Description: evaluate Ok-Button --------------------------------------------------------------------*/ void SwIndexMarkDlg::Apply() { @@ -545,7 +545,7 @@ void SwIndexMarkDlg::InsertMark() sal_Bool bCaseSensitive = aSearchCaseSensitiveCB.IsChecked(); pSh->StartAllAction(); - // all equal strings have to be selected here so that the + // all equal strings have to be selected here so that the // entry is apllied to all equal strings if(bApplyAll) { @@ -719,7 +719,7 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) { if(&aTypeDCB == pBox) { - // set index type + // set index type sal_uInt16 nPos = aTypeDCB.GetEntryPos(aTypeDCB.GetSelectEntry()); sal_Bool bLevelEnable = sal_False, bKeyEnable = sal_False, diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index c74bd2b9c4..e105c4760a 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -430,7 +430,7 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, if(!pCurTOX || (ppBase && !(*ppBase)) ) { - // when ppBase is passed over, TOXBase is only created here + // when ppBase is passed over, TOXBase is only created here // and then inserted in a global document by the dialog if(ppBase) (*ppBase) = pNewTOX; diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index aec1c15ed6..9917a22bd5 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -126,7 +126,7 @@ sal_uInt16 SwGlossaries::GetGroupCnt() ------------------------------------------------------------------------*/ sal_Bool SwGlossaries::FindGroupName(String & rGroup) { - // if the group name doesn't contain a path, a suitable group entry + // if the group name doesn't contain a path, a suitable group entry // can the searched for here; sal_uInt16 nCount = GetGroupCnt(); sal_uInt16 i; @@ -139,7 +139,7 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup) return sal_True; } } - // you can search two times because for more directories the case sensitive + // you can search two times because for more directories the case sensitive // name could occur multiple times const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore(); for(i = 0; i < nCount; i++) @@ -316,7 +316,7 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName) aTmp += SwGlossaries::GetExtension(); sFileURL += INET_PATH_TOKEN; sFileURL += aTmp; - // Even if the file doesn't exist it hast to be deleted from + // Even if the file doesn't exist it hast to be deleted from // the list of text block regions // no && because of CFfront sal_Bool bRemoved = SWUnoHelper::UCB_DeleteFile( sFileURL ); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 89d8dd8cd8..9c8fd1bd03 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -378,7 +378,7 @@ void SwGlossaryDlg::Apply() SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, const String& rShort) { - // look for possible entry in TreeListBox + // look for possible entry in TreeListBox SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); if(pEntry) { diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 4bd6f4626e..7f6eb4d564 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -57,7 +57,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) : SfxSingleTabDialog(&pVw->GetViewFrame()->GetWindow(), 0, 0), pSh(pVw->GetWrtShellPtr()) { - // create TabPage + // create TabPage SetTabPage(SwLineNumberingPage::Create(this, *(SfxItemSet*)0)); GetOKButton()->SetClickHdl(LINK(this, SwLineNumberingDlg, OKHdl)); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index f140ec0e34..89477a2693 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -265,7 +265,7 @@ IMPL_LINK( SwOutlineTabDialog, CancelHdl, Button *, EMPTYARG ) IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn ) { - // fill PopupMenu + // fill PopupMenu for( sal_uInt16 i = 0; i < SwChapterNumRules::nMaxRules; ++i ) { const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(i); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 94fd047f91..29897ab135 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -418,7 +418,7 @@ void SwRedlineAcceptDlg::Activate() aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count()); - if (!pView) // can happen when switching to another app, when a Listbox in the dialog + if (!pView) // can happen when switching to another app, when a Listbox in the dialog return; // had the focus previously (actually THs Bug) // did something change? diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 0dd4f92a6f..aa757f6b9c 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -696,7 +696,7 @@ void SwDrawTextShell::ExecRotateTransliteration( SfxRequest & rReq ) pOLV->TransliterateText( m_aRotateCase.getNextMode() ); } -} +} /*-------------------------------------------------------------------- Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX) |