[Libreoffice-commits] .: 19 commits - basctl/source basic/source chart2/source codemaker/inc codemaker/source config_host.mk.in configure.ac connectivity/Library_flat.mk connectivity/qa connectivity/source cui/source dbaccess/source editeng/source extensions/source extras/Module_extras.mk extras/source extras/Zip_gallrulers.mk extras/Zip_gallsystem.mk filter/source forms/qa forms/source framework/source i18npool/source l10ntools/inc l10ntools/source liblangtag/CustomTarget_langtag.mk liblangtag/ExternalPackage_langtag_data.mk librelogo/source lingucomponent/source linguistic/source odk/examples officecfg/registry oox/inc oox/source qadevOOo/runner reportbuilder/java reportdesign/source scp2/source sc/source sd/source sfx2/qa sfx2/source shell/CustomTarget_shlxthdl_res.mk slideshow/source solenv/gbuild sot/Library_sot.mk sot/source starmath/source svl/CppunitTest_svl_urihelper.mk svl/inc svl/Library_svl.mk svl/qa svl/source svtools/source svx/inc svx/source sw/inc sw/Library_swui.mk sw/sdi sw/source sw/uiconfig sw/UI_swriter.mk toolkit/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source writerfilter/qa xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 24 03:55:29 PST 2012
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 2
basic/source/comp/basiccharclass.cxx | 2
basic/source/runtime/methods.cxx | 6
chart2/source/tools/DiagramHelper.cxx | 6
codemaker/inc/codemaker/global.hxx | 2
codemaker/source/codemaker/global.cxx | 16
config_host.mk.in | 1
configure.ac | 39 +-
connectivity/Library_flat.mk | 1
connectivity/qa/connectivity/tools/sdb/Connection.java | 5
connectivity/source/drivers/evoab2/NResultSet.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 6
cui/source/options/optasian.cxx | 3
cui/source/options/optdict.cxx | 2
cui/source/options/optgdlg.cxx | 3
cui/source/tabpages/autocdlg.cxx | 12
dbaccess/source/core/api/RowSet.cxx | 6
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/ui/app/AppView.cxx | 2
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 4
dbaccess/source/ui/misc/TokenWriter.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2
dev/null |binary
editeng/source/editeng/editeng.cxx | 6
editeng/source/items/svxfont.cxx | 4
editeng/source/misc/forbiddencharacterstable.cxx | 2
editeng/source/misc/hangulhanja.cxx | 2
editeng/source/misc/svxacorr.cxx | 18
extensions/source/propctrlr/standardcontrol.cxx | 3
extensions/source/propctrlr/xsdvalidationhelper.cxx | 2
extras/Module_extras.mk | 1
extras/Zip_gallrulers.mk | 40 --
extras/Zip_gallsystem.mk | 3
filter/source/svg/svgfilter.cxx | 2
forms/qa/org/openoffice/complex/forms/tools/ResultSet.java | 5
forms/qa/org/openoffice/xforms/Instance.java | 5
forms/qa/org/openoffice/xforms/Model.java | 5
forms/qa/org/openoffice/xforms/XMLDocument.java | 5
forms/source/component/FormattedField.cxx | 4
framework/source/uielement/toolbarsmenucontroller.cxx | 2
i18npool/source/languagetag/languagetag.cxx | 29 -
l10ntools/inc/helpmerge.hxx | 4
l10ntools/source/helpmerge.cxx | 64 ---
liblangtag/CustomTarget_langtag.mk | 19 -
liblangtag/ExternalPackage_langtag_data.mk | 6
librelogo/source/ChangeLog | 4
librelogo/source/LibreLogo/LibreLogo.py | 15
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 5
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 5
linguistic/source/misc.cxx | 20 -
odk/examples/java/Inspector/XTreePathProvider.java | 9
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5
oox/inc/oox/ole/vbacontrol.hxx | 6
oox/source/ole/vbacontrol.cxx | 5
qadevOOo/runner/graphical/Tolerance.java | 5
reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java | 12
reportdesign/source/core/sdr/formatnormalizer.cxx | 2
reportdesign/source/ui/dlg/DateTime.cxx | 2
sc/source/core/data/global.cxx | 2
sc/source/core/data/globalx.cxx | 2
sc/source/core/tool/compiler.cxx | 7
sc/source/filter/xml/xmlimprt.cxx | 4
scp2/source/ooo/file_extra_ooo.scp | 6
sd/source/core/drawdoc.cxx | 5
sfx2/qa/complex/sfx2/DocumentEvents.java | 9
sfx2/qa/complex/sfx2/JUnitBasedTest.java | 9
sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java | 6
sfx2/source/appl/appserv.cxx | 4
sfx2/source/appl/linkmgr2.cxx | 3
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/view/orgmgr.cxx | 2
shell/CustomTarget_shlxthdl_res.mk | 2
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 5
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx | 2
solenv/gbuild/AllLangResTarget.mk | 2
solenv/gbuild/Configuration.mk | 1
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/ExtensionTarget.mk | 4
solenv/gbuild/InstallModuleTarget.mk | 1
solenv/gbuild/UI.mk | 1
solenv/gbuild/gbuild.help.txt | 2
solenv/gbuild/gbuild.mk | 8
solenv/gbuild/platform/IOS_ARM_GCC.mk | 7
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6
solenv/gbuild/platform/com_MSC_defs.mk | 5
solenv/gbuild/platform/macosx.mk | 7
solenv/gbuild/platform/solaris.mk | 5
solenv/gbuild/platform/unxgcc.mk | 9
sot/Library_sot.mk | 1
sot/source/sdstor/stgelem.cxx | 9
starmath/source/parse.cxx | 8
svl/CppunitTest_svl_urihelper.mk | 2
svl/Library_svl.mk | 1
svl/inc/svl/ondemand.hxx | 27 -
svl/inc/svl/zforlist.hxx | 4
svl/qa/unit/test_URIHelper.cxx | 2
svl/source/items/ctypeitm.cxx | 3
svl/source/items/dateitem.cxx | 2
svl/source/items/style.cxx | 2
svl/source/numbers/supservs.cxx | 2
svl/source/numbers/zforfind.cxx | 4
svl/source/numbers/zforlist.cxx | 46 +-
svl/source/numbers/zformat.cxx | 17
svl/source/numbers/zforscan.cxx | 7
svtools/source/contnr/fileview.cxx | 2
svtools/source/control/calendar.cxx | 12
svtools/source/control/ctrlbox.cxx | 2
svtools/source/control/fmtfield.cxx | 18
svtools/source/edit/syntaxhighlight.cxx | 2
svx/inc/galtheme.hrc | 1
svx/inc/svx/gallery.hxx | 1
svx/source/dialog/simptabl.cxx | 2
svx/source/form/ParseContext.cxx | 2
svx/source/form/fmcontrollayout.cxx | 4
svx/source/form/fmsrcimp.cxx | 8
svx/source/form/formcontrolfactory.cxx | 2
svx/source/gallery2/gallery1.cxx | 3
svx/source/gallery2/galtheme.src | 7
svx/source/svdraw/svdattr.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2
sw/Library_swui.mk | 1
sw/UI_swriter.mk | 1
sw/inc/cmdid.h | 1
sw/inc/swabstdlg.hxx | 1
sw/inc/swundo.hxx | 1
sw/sdi/_textsh.sdi | 5
sw/sdi/swriter.sdi | 27 -
sw/source/core/bastyp/breakit.cxx | 2
sw/source/core/bastyp/calc.cxx | 16
sw/source/core/bastyp/init.cxx | 2
sw/source/core/doc/docsort.cxx | 2
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/fields/authfld.cxx | 8
sw/source/core/fields/dbfld.cxx | 2
sw/source/core/fields/docufld.cxx | 4
sw/source/core/fields/expfld.cxx | 2
sw/source/core/fields/fldbas.cxx | 2
sw/source/core/fields/flddat.cxx | 2
sw/source/core/fields/reffld.cxx | 20 -
sw/source/core/frmedt/fecopy.cxx | 24 -
sw/source/core/frmedt/fedesc.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 24 -
sw/source/core/frmedt/feflyole.cxx | 4
sw/source/core/frmedt/feshview.cxx | 56 +--
sw/source/core/frmedt/fetab.cxx | 6
sw/source/core/frmedt/fews.cxx | 10
sw/source/core/frmedt/tblsel.cxx | 96 ++---
sw/source/core/tox/txmsrt.cxx | 2
sw/source/core/txtnode/txtedt.cxx | 6
sw/source/core/undo/undo.hrc | 17
sw/source/core/undo/undo.src | 4
sw/source/filter/ww8/rtfexport.cxx | 3
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/ui/app/docstyle.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 22 -
sw/source/ui/dialog/swdlgfact.hxx | 12
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fldui/inpdlg.cxx | 2
sw/source/ui/inc/insrule.hxx | 51 --
sw/source/ui/misc/insrule.cxx | 185 ----------
sw/source/ui/shells/textsh.cxx | 71 ---
sw/source/ui/utlui/attrdesc.cxx | 2
sw/source/ui/utlui/numfmtlb.cxx | 2
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 1
sw/uiconfig/swform/menubar/menubar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swriter/ui/horizontalrule.ui | 122 ------
sw/uiconfig/swxform/menubar/menubar.xml | 1
toolkit/source/controls/unocontrolmodel.cxx | 14
unotools/inc/unotools/charclass.hxx | 15
unotools/inc/unotools/intlwrapper.hxx | 11
unotools/inc/unotools/localedatawrapper.hxx | 16
unotools/source/i18n/charclass.cxx | 57 +--
unotools/source/i18n/intlwrapper.cxx | 23 -
unotools/source/i18n/localedatawrapper.cxx | 78 ++--
unotools/source/i18n/textsearch.cxx | 2
unotools/source/misc/syslocale.cxx | 10
unusedcode.easy | 6
vcl/inc/vcl/field.hxx | 2
vcl/inc/vcl/i18nhelp.hxx | 6
vcl/source/app/i18nhelp.cxx | 9
vcl/source/app/settings.cxx | 8
vcl/source/control/field.cxx | 33 +
vcl/source/control/field2.cxx | 8
vcl/source/edit/texteng.cxx | 2
writerfilter/qa/complex/ooxml/LoadDocuments.java | 9
xmloff/source/style/xmlnumfe.cxx | 28 -
xmloff/source/style/xmlnumfi.cxx | 4
194 files changed, 640 insertions(+), 1340 deletions(-)
New commits:
commit bda29669185b2e0277d9b78f1ef52383f44a1f3b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Nov 24 12:50:41 2012 +0100
CppunitTest_svl_urihelper calls non-inline LanguageTag functions
Change-Id: I077ad299d5e657ae7b2af67a3ef678a50664b4e1
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index e2bd9e3..7fd8da9 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -44,6 +44,7 @@ svl/qa/unit/test_URIHelper \
$(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
cppu \
cppuhelper \
+ i18nisolang1 \
sal \
i18nisolang1 \
svl \
commit 5234c1bf13014e1e12aab12e91754b36dac50a82
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 23 19:34:09 2012 +0100
Move in-build liblangtag data to solver's unittest/installation/share
...let BRAND_BASE_DIR point to solver's unittest/installation during CppUnit
tests, and get rid of LIBLANGTAG_SHARE special case. (Intending to add further
code to CppUnit tests soon that requires a fake BRAND_BASE_DIR, so clean this
up now.)
Change-Id: Ia5f0f247e54952f901c37ca31eda53f9c6591458
diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx
index 7f3c15e..8ec730c 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -123,24 +123,19 @@ void LiblantagDataRef::presetDataPath( const rtl::OUString& rPath )
void LiblantagDataRef::setupDataPath()
{
// maDataPath is assumed to be empty here.
- OUString aURL;
-
- if (!rtl::Bootstrap::get("BRAND_BASE_DIR", aURL) && !rtl::Bootstrap::get("LIBLANGTAG_SHARE", aURL))
- OSL_FAIL( "LiblantagDataRef: can't get BRAND_BASE_DIR");
- else
+ OUString aURL("$BRAND_BASE_DIR/share/liblangtag");
+ rtl::Bootstrap::expandMacros(aURL); //TODO: detect failure
+
+ // Check if data is in our own installation, else assume system
+ // installation.
+ OUString aData( aURL);
+ aData += "/language-subtag-registry.xml";
+ osl::DirectoryItem aDirItem;
+ if (osl::DirectoryItem::get( aData, aDirItem) == osl::DirectoryItem::E_None)
{
- // Check if data is in our own installation, else assume system
- // installation.
- aURL += "/share/liblangtag";
- OUString aData( aURL);
- aData += "/language-subtag-registry.xml";
- osl::DirectoryItem aDirItem;
- if (osl::DirectoryItem::get( aData, aDirItem) == osl::DirectoryItem::E_None)
- {
- OUString aPath;
- if (osl::FileBase::getSystemPathFromFileURL( aURL, aPath) == osl::FileBase::E_None)
- maDataPath = OUStringToOString( aPath, RTL_TEXTENCODING_UTF8);
- }
+ OUString aPath;
+ if (osl::FileBase::getSystemPathFromFileURL( aURL, aPath) == osl::FileBase::E_None)
+ maDataPath = OUStringToOString( aPath, RTL_TEXTENCODING_UTF8);
}
if (maDataPath.isEmpty())
maDataPath = "|"; // assume system
diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/liblangtag/ExternalPackage_langtag_data.mk
index 4b9fb25..f238a24 100644
--- a/liblangtag/ExternalPackage_langtag_data.mk
+++ b/liblangtag/ExternalPackage_langtag_data.mk
@@ -27,8 +27,8 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag))
-$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag,data/language-subtag-registry.xml))
-$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/bcp47,\
+$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag,data/language-subtag-registry.xml))
+$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag/common/bcp47,\
data/common/bcp47/calendar.xml \
data/common/bcp47/collation.xml \
data/common/bcp47/currency.xml \
@@ -41,6 +41,6 @@ $(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/
data/common/bcp47/transform_private_use.xml \
data/common/bcp47/variant.xml \
))
-$(eval $(call gb_ExternalPackage_add_files,langtag_data,share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml))
+$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/installation/share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 78f6d32..92b6185 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -42,7 +42,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
- LIBLANGTAG_SHARE=$(call gb_Helper_make_url,$(OUTDIR)) \
+ BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/installation) \
$(call gb_Executable_get_target_for_build,lngconvex) \
-ulf shlxthdl.ulf \
-rc $@ \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0f81a4d..2d8adad 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,7 +59,7 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen
define gb_CppunitTest__make_args
--headless \
-"-env:LIBLANGTAG_SHARE=$(call gb_Helper_make_url,$(OUTDIR))" \
+"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/installation)" \
$(if $(URE),\
$(if $(strip $(CONFIGURATION_LAYERS)),\
"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
commit 47ba53c3c8675b0a308f7478f0d1238922c8c438
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 23 19:07:59 2012 +0100
Remove unused liblangtag/CustomTarget_langtag.mk
Change-Id: Ia45446db1263b8969cf933e5d34130102605b3e9
diff --git a/liblangtag/CustomTarget_langtag.mk b/liblangtag/CustomTarget_langtag.mk
deleted file mode 100644
index 811628d..0000000
--- a/liblangtag/CustomTarget_langtag.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,liblangtag/langtag))
-
-$(call gb_CustomTarget_get_target,liblangtag/langtag) : $(call gb_Zip_get_target,liblangtag_data)
- rm -rf $(OUTDIR)/share/liblangtag \
- && mkdir -p $(OUTDIR)/share/liblangtag \
- && unzip $< -d $(OUTDIR)/share/liblangtag \
- && touch $(call gb_CustomTarget_get_workdir,liblangtag/langtag)/.dir
-
-
-# vim: set noet sw=4 ts=4:
commit 4b93c37a7c90f9cb37bc9afb2f25f565ff680980
Author: Eike Rathke <erack at redhat.com>
Date: Sat Nov 24 10:56:53 2012 +0100
link with i18nisolang1
Change-Id: I1ae06b7d9012e57ba66cca013bca47e5a9455b72
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 0312e7a..e2bd9e3 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
cppu \
cppuhelper \
sal \
+ i18nisolang1 \
svl \
tl \
utl \
commit 9626159f7a773cd11b1eb6b5aef8e1ce2ba2131a
Author: Eike Rathke <erack at redhat.com>
Date: Sat Nov 24 10:53:39 2012 +0100
use LanguageTag
Change-Id: I01b968c4abe705b1694632377d4bf21fae1d9cd6
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index b216698..9c564b2 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -429,7 +429,7 @@ namespace
ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XMultiServiceFactory >& _rxFactory )
:rSortOrder( _rSortOrder )
- ,aIntlWrapper( _rxFactory, SvtSysLocale().GetLocaleData().getLocale() )
+ ,aIntlWrapper( _rxFactory, SvtSysLocale().GetLanguageTag() )
{
}
};
commit 9343d996f5150b6aa8d2dd184a7ba918c7ee204b
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat Nov 24 10:18:27 2012 +0100
SwRTFWriter::WriteStream: fix leak
Change-Id: I86205aeeefd727090b780bc41a959200affa9920
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 33ab009..d45e057 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1144,7 +1144,8 @@ SwRTFWriter::~SwRTFWriter()
sal_uLong SwRTFWriter::WriteStream()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- RtfExport aExport( NULL, pDoc, new SwPaM( *pCurPam->End(), *pCurPam->Start() ), pCurPam, this, m_bOutOutlineOnly );
+ SwPaM aPam(*pCurPam->End(), *pCurPam->Start());
+ RtfExport aExport( NULL, pDoc, &aPam, pCurPam, this, m_bOutOutlineOnly );
aExport.ExportDocument( true );
return 0;
}
commit 233369b1e7990c6a3d03810b81eae0ee9175771d
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Nov 24 09:06:58 2012 +0900
sal_Bool to bool
Change-Id: I1bd921c55223671d3474c882b059b46fb87fd694
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index bb488fa..ff618c8 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -95,7 +95,7 @@ SwFieldType* SwAuthorityFieldType::Copy() const
void SwAuthorityFieldType::RemoveField(long nHandle)
{
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bRemoved = sal_False;
+ bool bRemoved = false;
#endif
for(sal_uInt16 j = 0; j < m_DataArr.size(); j++)
{
@@ -104,7 +104,7 @@ void SwAuthorityFieldType::RemoveField(long nHandle)
if(nRet == nHandle)
{
#if OSL_DEBUG_LEVEL > 0
- bRemoved = sal_True;
+ bRemoved = true;
#endif
pTemp->RemoveRef();
if(!pTemp->GetRefCount())
@@ -271,7 +271,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle)
{
//find the field in a sorted array of handles,
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bCurrentFieldWithoutTextNode = sal_False;
+ bool bCurrentFieldWithoutTextNode = false;
#endif
if(!m_SequArr.empty() && m_SequArr.size() != m_DataArr.size())
DelSequenceArray();
@@ -289,7 +289,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle)
{
#if OSL_DEBUG_LEVEL > 0
if(nHandle == ((SwAuthorityField*)pFmtFld->GetFld())->GetHandle())
- bCurrentFieldWithoutTextNode = sal_True;
+ bCurrentFieldWithoutTextNode = true;
#endif
continue;
}
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 4b4d0ba..9c46f41 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -435,7 +435,7 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
sal_uInt16 nSubTyp = GetSubType();
sal_Bool bVisible = sal_False;
if(!(rAny >>= bVisible))
- return sal_False;
+ return false;
if(bVisible)
nSubTyp &= ~nsSwExtendedSubType::SUB_INVISIBLE;
else
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index a990f09..2ca0244 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -246,7 +246,7 @@ bool SwDateTimeField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
{
util::DateTime aDateTimeValue;
if(!(rVal >>= aDateTimeValue))
- return sal_False;
+ return false;
DateTime aDateTime( DateTime::EMPTY );
aDateTime.Set100Sec(aDateTimeValue.HundredthSeconds);
aDateTime.SetSec(aDateTimeValue.Seconds);
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index bec55fb..4d68397 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -942,18 +942,18 @@ private:
std::set<sal_uInt16> aIds;
std::set<sal_uInt16> aDstIds;
std::map<sal_uInt16, sal_uInt16> sequencedIds; /// ID numbers sorted by sequence number.
- sal_Bool bInit;
+ bool bInit;
- void Init(SwDoc& rDoc, SwDoc& rDestDoc, sal_Bool bField );
+ void Init(SwDoc& rDoc, SwDoc& rDestDoc, bool bField );
void GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds );
void GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds );
void AddId( sal_uInt16 id, sal_uInt16 seqNum );
sal_uInt16 GetFirstUnusedId( std::set<sal_uInt16> &rIds );
public:
- _RefIdsMap( const String& rName ) : aName( rName ), bInit( sal_False ) {}
+ _RefIdsMap( const String& rName ) : aName( rName ), bInit( false ) {}
- void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld, sal_Bool bField );
+ void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld, bool bField );
String GetName() { return aName; }
};
@@ -992,7 +992,7 @@ void _RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
/// @param[in] rDoc The source document.
/// @param[in] rDestDoc The destination document.
/// @param[in] bField True if we're interested in all fields, false for footnotes.
-void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, sal_Bool bField )
+void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
{
if( bInit )
return;
@@ -1029,7 +1029,7 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, sal_Bool bField )
GetNoteIdsFromDoc( rDestDoc, aIds );
GetNoteIdsFromDoc( rDoc, aDstIds );
}
- bInit = sal_True;
+ bInit = true;
}
/// Get the lowest unused ID in the passed set.
@@ -1061,7 +1061,7 @@ void _RefIdsMap::AddId( sal_uInt16 id, sal_uInt16 seqNum )
}
void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
- sal_Bool bField )
+ bool bField )
{
Init( rDoc, rDestDoc, bField);
@@ -1134,13 +1134,13 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
aFldMap.push_back( pMap );
}
- pMap->Check( *pDoc, rDestDoc, rRefFld, sal_True );
+ pMap->Check( *pDoc, rDestDoc, rRefFld, true );
}
break;
case REF_FOOTNOTE:
case REF_ENDNOTE:
- aFntMap.Check( *pDoc, rDestDoc, rRefFld, sal_False );
+ aFntMap.Check( *pDoc, rDestDoc, rRefFld, false );
break;
}
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 5a7ea52..e30b18f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -244,7 +244,7 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
static sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor,
- Point& rNewPos, sal_Bool bCheckFlyRecur )
+ Point& rNewPos, bool bCheckFlyRecur )
{
sal_Bool bRet = sal_True;
rAnchor.SetAnchor( &rPos );
@@ -305,7 +305,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
SwFrmFmt *pFmt = pContact->GetFmt();
const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
- sal_Bool bInsWithFmt = sal_True;
+ bool bInsWithFmt = true;
if( pDestDrwView->IsGroupEntered() )
{
@@ -319,7 +319,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
GetDoc() == pDestDoc, false );
pNew->NbcMove( aSiz );
pDestDrwView->InsertObjectAtView( pNew, *pDestPgView );
- bInsWithFmt = sal_False;
+ bInsWithFmt = false;
}
}
@@ -347,7 +347,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
bRet = sal_False;
else
bRet = ::lcl_SetAnchor( aPos, *pNd, 0, rInsPt,
- *pDestShell, aAnchor, aNewAnch, sal_False );
+ *pDestShell, aAnchor, aNewAnch, false );
}
else
{
@@ -358,7 +358,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(),
*pCrsr->GetNode(), 0, rInsPt,
*pDestShell, aAnchor,
- aNewAnch, sal_False );
+ aNewAnch, false );
}
}
else if ( FLY_AT_PAGE == aAnchor.GetAnchorId() )
@@ -505,7 +505,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
}
else
bRet = ::lcl_SetAnchor( aPos, *pNd, pFly, rInsPt,
- *pDestShell, aAnchor, aNewAnch, sal_True );
+ *pDestShell, aAnchor, aNewAnch, true );
}
}
else
@@ -828,7 +828,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
{
SwPosition aDestPos( *PCURCRSR->GetPoint() );
- sal_Bool bParkTblCrsr = sal_False;
+ bool bParkTblCrsr = false;
const SwStartNode* pSttNd = PCURCRSR->GetNode()->FindTableBoxStartNode();
// TABLE IN TABLE: copy table in table
@@ -838,7 +838,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
{
GetTblSel( *this, aBoxes );
ParkTblCrsr();
- bParkTblCrsr = sal_True;
+ bParkTblCrsr = true;
}
else if( !PCURCRSR->HasMark() && PCURCRSR->GetNext() == PCURCRSR &&
( !pSrcNd->GetTable().IsTblComplex() ||
@@ -893,7 +893,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
for ( sal_uInt16 i = 0; i < pClpDoc->GetSpzFrmFmts()->size(); ++i )
{
- sal_Bool bInsWithFmt = sal_True;
+ bool bInsWithFmt = true;
const SwFrmFmt& rCpyFmt = *(*pClpDoc->GetSpzFrmFmts())[i];
if( Imp()->GetDrawView()->IsGroupEntered() &&
@@ -939,7 +939,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
pNew->NbcSetAnchorPos( aGrpAnchor );
pNew->SetSnapRect( aSnapRect );
- bInsWithFmt = sal_False;
+ bInsWithFmt = false;
}
}
@@ -967,7 +967,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
{
Point aPt;
lcl_SetAnchor( *PCURCRSR->GetPoint(), *PCURCRSR->GetNode(),
- 0, aPt, *this, aAnchor, aPt, sal_False );
+ 0, aPt, *this, aAnchor, aPt, false );
}
SwFrmFmt * pNew = GetDoc()->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
@@ -1081,7 +1081,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
for ( sal_uInt16 i = 0; i < pClpDoc->GetSpzFrmFmts()->size(); ++i )
{
- sal_Bool bInsWithFmt = sal_True;
+ bool bInsWithFmt = true;
const SwFrmFmt& rCpyFmt = *(*pClpDoc->GetSpzFrmFmts())[i];
if( bInsWithFmt )
{
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index 7715960..00b3568 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -63,10 +63,10 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
#if OSL_DEBUG_LEVEL > 0
// SS does not change PageDesc, but only sets the attibute.
// The Pagedesc should be available in the document
- sal_Bool bFound = sal_False;
+ bool bFound = false;
for ( sal_uInt16 nTst = 0; nTst < GetPageDescCnt(); ++nTst )
if ( &rDesc == &GetPageDesc( nTst ) )
- bFound = sal_True;
+ bFound = true;
OSL_ENSURE( bFound, "ChgCurPageDesc with invalid descriptor." );
#endif
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index c57ddf0..2673b31 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -92,16 +92,16 @@ void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
#* will be made, to fit to the format
#***********************************************************************/
-static sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
+static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
const Point& rPt )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwStartNode* pStNode = rNode.FindFlyStartNode();
if( pStNode )
{
SwPosition aPos( *pStNode );
rAnchor.SetAnchor( &aPos );
- bRet = sal_True;
+ bRet = true;
}
else
{
@@ -668,7 +668,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
{
GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_INSLAYFMT, NULL );
SwFmtAnchor* pOldAnchor = 0;
- sal_Bool bHOriChgd = sal_False, bVOriChgd = sal_False;
+ bool bHOriChgd = false, bVOriChgd = false;
SwFmtVertOrient aOldV;
SwFmtHoriOrient aOldH;
@@ -685,14 +685,14 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
if( SFX_ITEM_SET == rSet.GetItemState( RES_HORI_ORIENT, sal_False, &pItem )
&& text::HoriOrientation::NONE == ((SwFmtHoriOrient*)pItem)->GetHoriOrient() )
{
- bHOriChgd = sal_True;
+ bHOriChgd = true;
aOldH = *((SwFmtHoriOrient*)pItem);
((SfxItemSet&)rSet).Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT ) );
}
if( SFX_ITEM_SET == rSet.GetItemState( RES_VERT_ORIENT, sal_False, &pItem )
&& text::VertOrientation::NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient() )
{
- bVOriChgd = sal_True;
+ bVOriChgd = true;
aOldV = *((SwFmtVertOrient*)pItem);
((SfxItemSet&)rSet).Put( SwFmtVertOrient( 0, text::VertOrientation::TOP ) );
}
@@ -965,7 +965,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
long nNewPage;
SwRootFrm* pTmpRootFrm = GetLayout();//swmod 080317
sal_uInt16 nMaxPage = pTmpRootFrm->GetPageNum();
- sal_Bool bTmpAssert = sal_False;
+ bool bTmpAssert = false;
for( sal_uInt16 n = 0; n < rFillArr.size(); ++n )
{
SwFrmFmt* pFmt = rFillArr[n];
@@ -990,7 +990,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
}
else
pFmt->DelFrms();
- bTmpAssert = sal_True;
+ bTmpAssert = true;
}
aNewAnchor.SetPageNum( sal_uInt16(nNewPage) );
pDoc->SetAttr( aNewAnchor, *pFmt );
@@ -1574,8 +1574,8 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
const SwFmtURL &rURL = pFly->GetFmt()->GetURL();
if( rURL.GetURL().Len() || rURL.GetMap() )
{
- sal_Bool bSetTargetFrameName = pTargetFrameName != 0;
- sal_Bool bSetDescription = pDescription != 0;
+ bool bSetTargetFrameName = pTargetFrameName != 0;
+ bool bSetDescription = pDescription != 0;
if ( rURL.GetMap() )
{
IMapObject *pObject = pFly->GetFmt()->GetIMapObject( rPt, pFly );
@@ -1585,12 +1585,12 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
*pURL = pObject->GetURL();
if ( bSetTargetFrameName && pObject->GetTarget().Len() )
{
- bSetTargetFrameName = sal_False;
+ bSetTargetFrameName = false;
*pTargetFrameName = pObject->GetTarget();
}
if ( bSetDescription )
{
- bSetDescription = sal_False;
+ bSetDescription = false;
*pDescription = pObject->GetAltText();
}
pRet = pFly->GetFmt();
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 19f8f48..7cbcdca 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -65,7 +65,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject >
if ( !pFly )
{
// No or wrong fly selected: we have to search.
- sal_Bool bExist = sal_False;
+ bool bExist = false;
SwStartNode *pStNd;
sal_uLong nSttIdx = GetNodes().GetEndOfAutotext().StartOfSectionIndex() + 1,
nEndIdx = GetNodes().GetEndOfAutotext().GetIndex();
@@ -76,7 +76,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject >
if ( pNd->IsOLENode() &&
((SwOLENode*)pNd)->GetOLEObj().GetOleRef() == xObj )
{
- bExist = sal_True;
+ bExist = true;
SwFrm *pFrm = ((SwOLENode*)pNd)->getLayoutFrm( GetLayout() );
if ( pFrm )
pFly = pFrm->FindFlyFrm();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 84f8d9a..3506747 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -151,7 +151,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
// (e.g. due to Unmark->MarkListHasChgd) arrives
const SdrMarkList &rMrkList = pDView->GetMarkedObjectList();
- const sal_Bool bHadSelection = rMrkList.GetMarkCount() ? sal_True : sal_False;
+ const bool bHadSelection = rMrkList.GetMarkCount();
const sal_Bool bAddSelect = 0 != (SW_ADD_SELECT & nFlag);
const sal_Bool bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag);
SwFlyFrm* pOldSelFly = 0;
@@ -160,7 +160,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
if( bHadSelection )
{
// call Unmark when !bAddSelect or if fly was selected
- sal_Bool bUnmark = !bAddSelect;
+ bool bUnmark = !bAddSelect;
if ( rMrkList.GetMarkCount() == 1 )
{
@@ -180,7 +180,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
// corner.
Point aPt( pOldSelFly->Frm().Pos() );
aPt.X() -= 1;
- sal_Bool bUnLockView = !IsViewLocked();
+ bool bUnLockView = !IsViewLocked();
LockView( sal_True );
SetCrsr( aPt, sal_True );
if( bUnLockView )
@@ -191,7 +191,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
{
GetWin()->Invalidate( pOldSelFly->Frm().SVRect() );
}
- bUnmark = sal_True;
+ bUnmark = true;
}
}
if ( bUnmark )
@@ -413,7 +413,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
if( pPage->GetSortedObjs() )
{
int i;
- sal_Bool bOld = sal_False;
+ bool bOld = false;
Point aCenter( pOld->Frm().Left() + pOld->Frm().Width()/2,
pOld->Frm().Top() + pOld->Frm().Height()/2 );
Point aBest;
@@ -425,7 +425,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
{
SwFlyFrm* pTmp = static_cast<SwFlyFrm*>(pAnchObj);
if( pTmp == pOld )
- bOld = sal_True;
+ bOld = true;
else
{
const SwFlyFrm* pCheck = pFly ? pTmp : 0;
@@ -442,34 +442,34 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
pTmp->Frm().Width()/2,
pTmp->Frm().Top() +
pTmp->Frm().Height()/2 );
- sal_Bool bAccept = sal_False;
+ bool bAccept = false;
switch( nDir ) {
case SW_MOVE_RIGHT:
{
bAccept = LESS_X( aCenter, aNew, bOld )
&& ( !pNewFly ||
- LESS_X( aNew, aBest, sal_False ) );
+ LESS_X( aNew, aBest, false ) );
break;
}
case SW_MOVE_LEFT:
{
bAccept = LESS_X( aNew, aCenter, !bOld )
&& ( !pNewFly ||
- LESS_X( aBest, aNew, sal_True ) );
+ LESS_X( aBest, aNew, true ) );
break;
}
case SW_MOVE_UP:
{
bAccept = LESS_Y( aNew, aCenter, !bOld )
&& ( !pNewFly ||
- LESS_Y( aBest, aNew, sal_True ) );
+ LESS_Y( aBest, aNew, true ) );
break;
}
case SW_MOVE_DOWN:
{
bAccept = LESS_Y( aCenter, aNew, bOld )
&& ( !pNewFly ||
- LESS_Y( aNew, aBest, sal_False ) );
+ LESS_Y( aNew, aBest, false ) );
break;
}
}
@@ -780,7 +780,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
for( sal_uInt16 j = 0; j < pLst->GetMarkCount(); ++j )
{
SwPageFrm *pPage;
- sal_Bool bCheckNeighbours = sal_False;
+ bool bCheckNeighbours = false;
sal_Int16 aHori = text::HoriOrientation::NONE;
SwRect aRect;
SdrObject *pO = pLst->GetMark( 0 )->GetMarkedSdrObj();
@@ -793,7 +793,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
if( text::HoriOrientation::NONE != aHori && text::HoriOrientation::CENTER != aHori &&
pFly->IsFlyAtCntFrm() )
{
- bCheckNeighbours = sal_True;
+ bCheckNeighbours = true;
pFly->InvalidatePos();
pFly->Frm().Pos().Y() += 1;
}
@@ -1252,18 +1252,18 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
* Does the object include a control or groups,
* which comprise only controls
* --------------------------------------------------*/
-static sal_Bool lcl_IsControlGroup( const SdrObject *pObj )
+static bool lcl_IsControlGroup( const SdrObject *pObj )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if(pObj->ISA(SdrUnoObj))
bRet = sal_True;
else if( pObj->ISA( SdrObjGroup ) )
{
- bRet = sal_True;
+ bRet = true;
const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
if( !::lcl_IsControlGroup( pLst->GetObj( i ) ) )
- return sal_False;
+ return false;
}
return bRet;
}
@@ -1301,8 +1301,8 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
Point aTopPos( nTmp, nTmp );
Point aCurPos;
Point aPos;
- sal_Bool bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType);
- sal_Bool bNoFly = 0 == (GOTOOBJ_FLY_ANY & eType);
+ bool bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType);
+ bool bNoFly = 0 == (GOTOOBJ_FLY_ANY & eType);
if( !bNoFly && bNoDraw )
{
@@ -1818,7 +1818,7 @@ sal_Bool SwFEShell::ImpEndCreate()
{
SfxItemSet aHtmlSet( GetDoc()->GetAttrPool(), RES_VERT_ORIENT, RES_HORI_ORIENT );
// horizontal orientation:
- const sal_Bool bLeftFrm = aFlyRect.Left() <
+ const bool bLeftFrm = aFlyRect.Left() <
pAnch->Frm().Left() + pAnch->Prt().Left(),
bLeftPrt = aFlyRect.Left() + aFlyRect.Width() <
pAnch->Frm().Left() + pAnch->Prt().Width()/2;
@@ -1829,7 +1829,7 @@ sal_Bool SwFEShell::ImpEndCreate()
}
else
{
- const sal_Bool bRightFrm = aFlyRect.Left() >
+ const bool bRightFrm = aFlyRect.Left() >
pAnch->Frm().Left() + pAnch->Prt().Width();
aHori.SetHoriOrient( text::HoriOrientation::RIGHT );
aHori.SetRelationOrient( bRightFrm ? text::RelOrientation::FRAME : text::RelOrientation::PRINT_AREA );
@@ -2015,7 +2015,7 @@ sal_Bool SwFEShell::EndMark()
if ( bRet )
{
- sal_Bool bShowHdl = sal_False;
+ bool bShowHdl = false;
SwDrawView* pDView = Imp()->GetDrawView();
// frames are not selected this way, except when
// it is only one frame
@@ -2030,7 +2030,7 @@ sal_Bool SwFEShell::EndMark()
{
if ( !bShowHdl )
{
- bShowHdl = sal_True;
+ bShowHdl = true;
}
rMrkList.DeleteMark( i );
--i; // no exceptions
@@ -2752,15 +2752,15 @@ void SwFEShell::HideChainMarker()
void SwFEShell::SetChainMarker()
{
- sal_Bool bDelFrom = sal_True,
- bDelTo = sal_True;
+ bool bDelFrom = true,
+ bDelTo = true;
if ( IsFrmSelected() )
{
SwFlyFrm *pFly = FindFlyFrm();
if ( pFly->GetPrevLink() )
{
- bDelFrom = sal_False;
+ bDelFrom = false;
const SwFrm *pPre = pFly->GetPrevLink();
Point aStart( pPre->Frm().Right(), pPre->Frm().Bottom());
@@ -2773,7 +2773,7 @@ void SwFEShell::SetChainMarker()
}
if ( pFly->GetNextLink() )
{
- bDelTo = sal_False;
+ bDelTo = false;
const SwFlyFrm *pNxt = pFly->GetNextLink();
Point aStart( pFly->Frm().Right(), pFly->Frm().Bottom());
@@ -2975,7 +2975,7 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const
pText->SetLogicRect(aRect);
sal_Bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotId);
- sal_Bool bMarquee = (SID_DRAW_TEXT_MARQUEE == nSlotId);
+ bool bMarquee = (SID_DRAW_TEXT_MARQUEE == nSlotId);
pText->SetVerticalWriting(bVertical);
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 04773d6..9f4d2b8 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2333,7 +2333,7 @@ sal_Bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
return bRet;
}
-static sal_Bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml,
+static bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml,
SwCellFrms& rCells )
{
SwTblBoxFormula aTmp( rFml );
@@ -2348,10 +2348,10 @@ static sal_Bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormul
break; // found
if( iC == rCells.end() )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// ask formula for auto-sum
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 2565436..0e802b9 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -129,10 +129,10 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
if( !pFrm )
return GetLayout()->Frm();
- sal_Bool bFrm = sal_True;
+ bool bFrm = true;
switch ( eType )
{
- case RECT_PAGE_PRT: bFrm = sal_False; /* no break */
+ case RECT_PAGE_PRT: bFrm = false; /* no break */
case RECT_PAGE : pFrm = pFrm->FindPageFrm();
break;
@@ -141,7 +141,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
pFrm->Calc();
break;
- case RECT_FLY_PRT_EMBEDDED: bFrm = sal_False; /* no break */
+ case RECT_FLY_PRT_EMBEDDED: bFrm = false; /* no break */
case RECT_FLY_EMBEDDED: pFrm = xObj.is() ? FindFlyFrm( xObj )
: pFrm->IsFlyFrm()
? pFrm
@@ -164,10 +164,10 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
if( RECT_OUTTABSECTION_PRT == eType ||
RECT_SECTION_PRT == eType )
- bFrm = sal_False;
+ bFrm = false;
break;
- case RECT_HEADERFOOTER_PRT: bFrm = sal_False; /* no break */
+ case RECT_HEADERFOOTER_PRT: bFrm = false; /* no break */
case RECT_HEADERFOOTER: if( 0 == (pFrm = pFrm->FindFooterOrHeader()) )
return GetLayout()->Frm();
break;
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 43e38e0..145ca64 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -79,21 +79,19 @@ struct _CmpLPt
{
Point aPos;
const SwTableBox* pSelBox;
- sal_Bool bVert;
+ bool bVert;
- _CmpLPt( const Point& rPt, const SwTableBox* pBox, sal_Bool bVertical );
+ _CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical );
bool operator==( const _CmpLPt& rCmp ) const
- { return X() == rCmp.X() && Y() == rCmp.Y() ? sal_True : sal_False; }
+ { return X() == rCmp.X() && Y() == rCmp.Y(); }
bool operator<( const _CmpLPt& rCmp ) const
{
if ( bVert )
- return X() > rCmp.X() || ( X() == rCmp.X() && Y() < rCmp.Y() )
- ? sal_True : sal_False;
+ return X() > rCmp.X() || ( X() == rCmp.X() && Y() < rCmp.Y() );
else
- return Y() < rCmp.Y() || ( Y() == rCmp.Y() && X() < rCmp.X() )
- ? sal_True : sal_False;
+ return Y() < rCmp.Y() || ( Y() == rCmp.Y() && X() < rCmp.X() );
}
long X() const { return aPos.X(); }
@@ -268,12 +266,12 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
int bChkProtected = nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType;
- sal_Bool bTblIsValid;
+ bool bTblIsValid;
// #i55421# Reduced value 10
int nLoopMax = 10;
do {
- bTblIsValid = sal_True;
+ bTblIsValid = true;
// First, compute tables and rectangles
SwSelUnions aUnions;
@@ -295,7 +293,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
const SwTabFrm *pTable = pUnion->GetTable();
if( !pTable->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -308,7 +306,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
{
if( !pRow->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -320,7 +318,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
{
if( !pCell->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -427,7 +425,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
rBoxes.clear();
--nLoopMax;
- } while( sal_True );
+ } while( true );
OSL_ENSURE( nLoopMax, "Table layout is still invalid!" );
}
@@ -472,14 +470,14 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
OSL_ENSURE( pEnd, "without frame nothing works" );
- sal_Bool bTblIsValid, bValidChartSel;
+ bool bTblIsValid, bValidChartSel;
// #i55421# Reduced value 10
int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
sal_uInt16 i = 0;
do {
- bTblIsValid = sal_True;
- bValidChartSel = sal_True;
+ bTblIsValid = true;
+ bValidChartSel = true;
sal_uInt16 nRowCells = USHRT_MAX;
@@ -499,7 +497,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
if( !pTable->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -514,7 +512,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
{
if( !pRow->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -527,7 +525,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
{
if( !pCell->IsValid() && nLoopMax )
{
- bTblIsValid = sal_False;
+ bTblIsValid = false;
break;
}
@@ -567,7 +565,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
_Sort_CellFrm( *(SwCellFrm*)pCell) );
else
{
- bValidChartSel = sal_False;
+ bValidChartSel = false;
break;
}
}
@@ -606,7 +604,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
nRowCells = nCellCnt;
else if( nRowCells != nCellCnt )
{
- bValidChartSel = sal_False;
+ bValidChartSel = false;
break;
}
}
@@ -629,7 +627,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
}
else
{
- bValidChartSel = sal_False;
+ bValidChartSel = false;
break;
}
}
@@ -638,7 +636,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
if( USHRT_MAX == nRowCells )
nRowCells = nCellCnt;
else if( nRowCells != nCellCnt )
- bValidChartSel = sal_False;
+ bValidChartSel = false;
}
}
@@ -658,11 +656,11 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
break;
}
--nLoopMax;
- } while( sal_True );
+ } while( true );
OSL_ENSURE( nLoopMax, "table layout is still invalid!" );
- return bValidChartSel;
+ return bValidChartSel ? sal_True : sal_False;
}
@@ -710,7 +708,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
// by default, first test above and then to the left
::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_COL );
- sal_Bool bTstRow = sal_True, bFound = sal_False;
+ bool bTstRow = true, bFound = false;
sal_uInt16 i;
// 1. check if box above contains value/formula
@@ -744,7 +742,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
// all boxes together, do not check the
// row, if a formula or value was found
bTstRow = 0 == nWhichId || USHRT_MAX == nWhichId;
- bFound = sal_True;
+ bFound = true;
break;
}
@@ -778,7 +776,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
// 2. check if box on left contains value/formula
if( bTstRow )
{
- bFound = sal_False;
+ bFound = false;
rBoxes.clear();
aUnions.clear();
@@ -813,7 +811,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
// all boxes together, do not check the
// row if a formula or value was found
bFound = 0 != nWhichId && USHRT_MAX != nWhichId;
- bTstRow = sal_False;
+ bTstRow = false;
break;
}
@@ -844,7 +842,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
}
}
- return bFound;
+ return bFound ? sal_True : sal_False;
}
sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes )
@@ -862,7 +860,7 @@ sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes )
}
-_CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, sal_Bool bVertical )
+_CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical )
: aPos( rPt ), pSelBox( pBox ), bVert( bVertical )
{}
@@ -1148,7 +1146,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
// 1. Solution: map array and all on same Y-level
// are separated with blanks
// all others are separated with paragraphs
- sal_Bool bCalcWidth = sal_True;
+ bool bCalcWidth = true;
const SwTableBox* pFirstBox = aPosArr[ 0 ].pSelBox;
// JP 27.03.98: Optimise - if boxes on one row are empty,
@@ -1175,7 +1173,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
else
{
if( bCalcWidth && n )
- bCalcWidth = sal_False; // one line is ready
+ bCalcWidth = false; // one line is ready
if( bEmptyLine && nSttPos < n )
{
@@ -1226,7 +1224,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
else
{
if( bCalcWidth && n )
- bCalcWidth = sal_False; // one line ready
+ bCalcWidth = false; // one line ready
// first those at the beginning
if( nSttPos < nSEndPos )
@@ -1307,7 +1305,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // same Y level?
nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
else
- bCalcWidth = sal_False; // one line ready
+ bCalcWidth = false; // one line ready
}
if( IsEmptyBox( *rPt.pSelBox, aPam ) )
@@ -1391,7 +1389,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
// where is now aInsPos ??
if( bCalcWidth )
- bCalcWidth = sal_False; // one line is ready
+ bCalcWidth = false; // one line is ready
// skip the first TextNode
rInsPosNd.Assign( pDoc->GetNodes(),
@@ -1417,9 +1415,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
}
-static sal_Bool lcl_CheckCol(_FndBox const&, sal_Bool* pPara);
+static bool lcl_CheckCol(_FndBox const&, bool* pPara);
-static sal_Bool lcl_CheckRow( const _FndLine& rFndLine, sal_Bool* pPara )
+static bool lcl_CheckRow( const _FndLine& rFndLine, bool* pPara )
{
for (_FndBoxes::const_iterator it = rFndLine.GetBoxes().begin();
it != rFndLine.GetBoxes().end(); ++it)
@@ -1429,14 +1427,14 @@ static sal_Bool lcl_CheckRow( const _FndLine& rFndLine, sal_Bool* pPara )
return *pPara;
}
-static sal_Bool lcl_CheckCol( _FndBox const& rFndBox, sal_Bool* pPara )
+static bool lcl_CheckCol( _FndBox const& rFndBox, bool* pPara )
{
if (!rFndBox.GetBox()->GetSttNd())
{
if (rFndBox.GetLines().size() !=
rFndBox.GetBox()->GetTabLines().size())
{
- *pPara = sal_False;
+ *pPara = false;
}
else
BOOST_FOREACH( _FndLine const& rFndLine, rFndBox.GetLines() )
@@ -1444,7 +1442,7 @@ static sal_Bool lcl_CheckCol( _FndBox const& rFndBox, sal_Bool* pPara )
}
// is box protected ??
else if (rFndBox.GetBox()->GetFrmFmt()->GetProtect().IsCntntProtected())
- *pPara = sal_False;
+ *pPara = false;
return *pPara;
}
@@ -1480,7 +1478,7 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes )
ForEach_FndLineCopyCol( (SwTableLines&)pTblNd->GetTable().GetTabLines(), &aPara );
if( !aFndBox.GetLines().empty() )
{
- sal_Bool bMergeSelOk = sal_True;
+ bool bMergeSelOk = true;
_FndBox* pFndBox = &aFndBox;
_FndLine* pFndLine = 0;
while( pFndBox && 1 == pFndBox->GetLines().size() )
@@ -1779,14 +1777,14 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
const SwTabFrm *pEndTable = pEnd->FindTabFrm();
if( !pTable || !pEndTable )
return;
- sal_Bool bExchange = sal_False;
+ bool bExchange = false;
if ( pTable != pEndTable )
{
if ( !pTable->IsAnFollow( pEndTable ) )
{
OSL_ENSURE( pEndTable->IsAnFollow( pTable ), "Tabchain in knots." );
- bExchange = sal_True;
+ bExchange = true;
}
}
else
@@ -1798,10 +1796,10 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
{
if( (pStart->Frm().*fnRect->fnGetLeft)() >
(pEnd->Frm().*fnRect->fnGetLeft)() )
- bExchange = sal_True;
+ bExchange = true;
}
else if( bVert == ( nSttTop < nEndTop ) )
- bExchange = sal_True;
+ bExchange = true;
}
if ( bExchange )
{
@@ -2204,7 +2202,7 @@ void _FndBox::DelFrms( SwTable &rTable )
{
if ( pFrm->GetTabLine() == rTable.GetTabLines()[i] )
{
- sal_Bool bDel = sal_True;
+ bool bDel = true;
SwTabFrm *pUp = !pFrm->GetPrev() && !pFrm->GetNext() ?
(SwTabFrm*)pFrm->GetUpper() : 0;
if ( !pUp )
@@ -2268,7 +2266,7 @@ void _FndBox::DelFrms( SwTable &rTable )
}
}
delete pUp;
- bDel = sal_False; // Row goes to /dev/null.
+ bDel = false; // Row goes to /dev/null.
}
}
if ( bDel )
@@ -2292,7 +2290,7 @@ void _FndBox::DelFrms( SwTable &rTable )
}
}
-static sal_Bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
+static bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
{
const SwTabFrm* pTblFrm = rChk.FindTabFrm();
if( pTblFrm->IsFollow() )
commit 05bb624ca75f9960c7b5a5f8c02b4e7b011585e8
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Nov 23 21:12:39 2012 +0200
Try to get rid of the SVG export code when DISABLE_EXPORT
Change-Id: I89d226a8442558fbdff84de2115fa013c1690239
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index b5b4584..bbe2a3c 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -92,6 +92,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
if( mxDstDoc.is() )
bRet = implImport( rDescriptor );
+#ifndef DISABLE_EXPORT
else if( mxSrcDoc.is() )
{
if( !mbExportAll && !mSelectedPages.hasElements() )
@@ -233,6 +234,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
bRet = implExport( rDescriptor );
}
+#endif
else
bRet = sal_False;
commit 79abef83e1356fcadc1c647c181b1f81531c0818
Author: Eike Rathke <erack at redhat.com>
Date: Sat Nov 24 01:50:22 2012 +0100
use LanguageTag
Change-Id: Ifa60bb0fc3cfde40a9a01478cfacf3ba2baba2b9
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 52828b9..822b5a2 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -387,7 +387,7 @@ void Test::testFindFirstURLInText() {
{ "generic:path", 0, 0, 0 },
{ "wfs:", 0, 0, 0 }
};
- CharClass charClass( m_context, com::sun::star::lang::Locale("en", "US", ""));
+ CharClass charClass( m_context, LanguageTag( com::sun::star::lang::Locale("en", "US", "")));
for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) {
rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input));
xub_StrLen begin = 0;
commit f3afa63ef9f4e28c89bf8ee777724ccd1059bd4a
Author: László Németh <nemeth at numbertext.org>
Date: Sat Nov 24 01:10:02 2012 +0100
LibreLogo: fix drawing at the left border, eg. for crop marks
Change-Id: I4798f3575aa90f06c9458ae89d94f72312cf53ab
diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 17f19a8..414c50e 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,7 @@
+
+2012-11-24 László Németh:
+ * zero turtle width in hideturtle mode to draw at the left border of the page
+
2012-11-06 László Németh:
* uppercase/translation icon:
- expands and uppercase Logo commands (fd -> FORWARD)
diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index fd33a53..db697bd 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -12,7 +12,7 @@ import re, random, traceback, itertools
import threading, time as __time__
ctx = uno.getComponentContext()
-__lngpath__ = re.sub("[\w_.]*$", "", ctx.ServiceManager.createInstanceWithContext("org.openoffice.LibreLogo.LibreLogoDummy", ctx).get_path())
+__lngpath__ = re.sub("[\w_.]*$", "", ctx.ServiceManager.createInstanceWithContext("org.openoffice.LibreLogo.LibreLogoDummy", ctx).get_path()) # instead of PackageInformationProvider, see #115393#
__translang__ = "cz|de|dk|en_US|es|fr|hu|it|nl|no|pl|pt|ru|se|sl" # FIXME supported languages for language guessing, expand this list, according to the localizations
__lng__ = {}
__docs__ = {}
@@ -138,6 +138,12 @@ for i in range(32):
__bezierdot__.Coordinates = (tuple(__dots__),)
__bezierdot__.Flags = ((0,) * 32,)
+# turtle shape
+__TURTLESHAPE__ = [((__Point__(-60, 0), __Point__(0, -100), __Point__(60, 0)), (__Point__(0, 0), __Point__(0, 100)), \
+ (__Point__(-250, 0),), (__Point__(0, 250),), (__Point__(250, 0),), (__Point__(0, -250),), # single points for wider selection
+ (__Point__(0, 0),)), # last point for position handling
+ ((__Point__(0, 0),),)] # hidden turtle (single point to draw at the left border of the page area)
+
def __getdocument__():
global __docs__, _
doc = XSCRIPTCONTEXT.getDocument()
@@ -397,9 +403,7 @@ def __initialize__():
shape.TextWrap = __THROUGHT__
shape.Opaque = True
_.drawpage.add(shape)
- shape.PolyPolygon = ((__Point__(-60, 0), __Point__(0, -100), __Point__(60, 0)), (__Point__(0, 0), __Point__(0, 100)), \
- (__Point__(-250, 0),), (__Point__(0, 250),), (__Point__(250, 0),), (__Point__(0, -250),), # single points for wider selection
- (__Point__(0, 0),)) # last point for position handling
+ shape.PolyPolygon = __TURTLESHAPE__[0]
_.shapecache[__TURTLE__] = shape
shape.Name = __TURTLE__
_.initialize()
@@ -461,6 +465,7 @@ def hideturtle():
turtle = __getshape__(__TURTLE__)
if turtle:
__visible__(turtle, False)
+ turtle.PolyPolygon = __TURTLESHAPE__[1]
turtle.LineTransparence, turtle.FillTransparence = 100, 100 # for saved files
__dispatcher__(".uno:Escape")
@@ -472,6 +477,7 @@ def showturtle():
pencolor(_.pencolor)
fillcolor(_.areacolor)
pensize(_.pensize/__PT_TO_TWIP__)
+ turtle.PolyPolygon = __TURTLESHAPE__[0]
__visible__(turtle, True)
_.doc.CurrentController.select(__getshape__(__TURTLE__))
else:
@@ -1308,7 +1314,6 @@ def __compil__(s):
s = re.sub(ur"(?i)\n[ ]*(%s)[ ]+" % __l12n__(_.lng)['TO'], "\n__def__ ", s)
subnames = re.findall(u"(?iu)(?<=__def__ )\w+", s)
globs = ""
-
functions = ["range", "__int__", "__float__", "Random", "Input", "__string__", "len", "round", "abs", "sin", "cos", "sqrt", "set", "list", "tuple", "re.sub", "re.search", "re.findall", "sorted", "min", "max"]
if len(subnames) > 0:
commit d1bfce298bb0414cafcd94cc8cd4694bdc3b4811
Author: Andras Timar <atimar at suse.com>
Date: Sat Nov 24 00:11:01 2012 +0100
missing po files should not don't break the build
Change-Id: I686341c79e77f16c6a4cd81cf9fedcd25c4e4996
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 78a775e..1715fba 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -79,7 +79,7 @@ endef
define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
$(call gb_SrsPartMergeTarget_get_target,$(1)) : POFILES := $(2)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(2)
-
+$(2) :
endef
# SrsPartTarget class
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 95f20e3..84b9fab 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -282,6 +282,7 @@ $(call gb_XcuMergeTarget_get_target,$(1)) : \
$(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po))
$(call gb_XcuMergeTarget_get_target,$(1)) : \
POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) :
endef
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index dbe219d..b679cca 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -151,6 +151,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : \
POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
$(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
endif
$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -248,6 +249,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
POFILE := $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po
+$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po :
endif
$(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
@@ -328,6 +330,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) :
endif
endif
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -369,6 +372,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(4))))
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(4))))
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(4)))) :
endif
endif
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 4ea77c9..f6ed5b2 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -146,6 +146,7 @@ $(call gb_ScpMergeTarget_get_target,$(1)) : \
SCP_POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
$(call gb_ScpMergeTarget_get_target,$(1)) : \
$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) :
endef
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 73c69c5..92c1a57 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -53,6 +53,7 @@ $(call gb_UILocalizeTarget_get_target,$(1)) : $(foreach lang,$(gb_UITarget_LANGS
$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(2).ui
$(call gb_UILocalizeTarget_get_target,$(1)) :| $(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir
+$(foreach lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po) :
endef
# class UITarget
commit 1994d859e3fd1ccbf41fad0afddba7d8a514a63d
Author: José Guilherme Vanz <guilherme.sft at gmail.com>
Date: Fri Nov 23 12:33:36 2012 -0200
fdo#51304 Remove @author annotation
This commit removes @author annotations, some templates comments. It has some
cleanup.
Change-Id: I995ba7b06d661fcec17f26c368d9449c0bf5ab45
Signed-off-by: José Guilherme Vanz <guilherme.sft at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1146
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
index 935b077..f530fa9 100644
--- a/connectivity/qa/connectivity/tools/sdb/Connection.java
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package connectivity.tools.sdb;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java
index 6bfc770..04a84fd 100644
--- a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java
+++ b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.openoffice.complex.forms.tools;
import com.sun.star.container.XNameAccess;
diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java
index ec99b55..8af514e 100644
--- a/forms/qa/org/openoffice/xforms/Instance.java
+++ b/forms/qa/org/openoffice/xforms/Instance.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.openoffice.xforms;
import com.sun.star.xml.dom.DOMException;
diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java
index b96eb9e..e8d1361 100644
--- a/forms/qa/org/openoffice/xforms/Model.java
+++ b/forms/qa/org/openoffice/xforms/Model.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.openoffice.xforms;
import com.sun.star.beans.XPropertySet;
diff --git a/forms/qa/org/openoffice/xforms/XMLDocument.java b/forms/qa/org/openoffice/xforms/XMLDocument.java
index e71e755..80d9764 100644
--- a/forms/qa/org/openoffice/xforms/XMLDocument.java
+++ b/forms/qa/org/openoffice/xforms/XMLDocument.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.openoffice.xforms;
import com.sun.star.container.NoSuchElementException;
diff --git a/odk/examples/java/Inspector/XTreePathProvider.java b/odk/examples/java/Inspector/XTreePathProvider.java
index 90ab022..fc29af5 100644
--- a/odk/examples/java/Inspector/XTreePathProvider.java
+++ b/odk/examples/java/Inspector/XTreePathProvider.java
@@ -16,15 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * xTreePathProvider.java
- *
- * Created on 12. Dezember 2006, 13:30
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
public interface XTreePathProvider {
public XUnoNode getLastPathComponent();
diff --git a/qadevOOo/runner/graphical/Tolerance.java b/qadevOOo/runner/graphical/Tolerance.java
index 8da29cd..8085716 100644
--- a/qadevOOo/runner/graphical/Tolerance.java
+++ b/qadevOOo/runner/graphical/Tolerance.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package graphical;
public class Tolerance
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
index b05fc4f..af9afa4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
@@ -15,24 +15,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * BorderRightMapper.java
- *
- * Created on 16. Februar 2007, 13:00
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
package com.sun.star.report.pentaho.parser.stylemapper.fo;
import com.sun.star.report.pentaho.parser.StyleMapper;
import org.jfree.layouting.input.style.CSSDeclarationRule;
-/**
- *
- * @author oj93728
- */
public class BorderRightMapper implements StyleMapper
{
diff --git a/sfx2/qa/complex/sfx2/DocumentEvents.java b/sfx2/qa/complex/sfx2/DocumentEvents.java
index a38e137..a60e8ff 100755
--- a/sfx2/qa/complex/sfx2/DocumentEvents.java
+++ b/sfx2/qa/complex/sfx2/DocumentEvents.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package complex.sfx2;
import com.sun.star.document.DocumentEvent;
@@ -24,10 +19,6 @@ import org.junit.Test;
import static org.junit.Assert.*;
import org.openoffice.test.tools.OfficeDocument;
-/**
- *
- * @author frank.shoenheit at oracle.com
- */
public class DocumentEvents extends JUnitBasedTest
{
@Before
diff --git a/sfx2/qa/complex/sfx2/JUnitBasedTest.java b/sfx2/qa/complex/sfx2/JUnitBasedTest.java
index a434937..8afa24e 100755
--- a/sfx2/qa/complex/sfx2/JUnitBasedTest.java
+++ b/sfx2/qa/complex/sfx2/JUnitBasedTest.java
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package complex.sfx2;
import org.openoffice.test.OfficeConnection;
@@ -12,10 +7,6 @@ import com.sun.star.uno.XComponentContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-/**
- *
- * @author Frank
- */
public class JUnitBasedTest
{
// -----------------------------------------------------------------------------------------------------------------
diff --git a/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
index 0455bcc..12f6283 100644
--- a/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
+++ b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
@@ -16,11 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package complex.sfx2.undo;
import com.sun.star.awt.Rectangle;
@@ -42,7 +37,6 @@ import static org.junit.Assert.*;
/**
* implements the {@link DocumentTest} interface on top of a drawing document
- * @author frank.schoenheit at oracle.com
*/
public abstract class DrawingOrPresentationDocumentTest extends DocumentTestBase
{
diff --git a/writerfilter/qa/complex/ooxml/LoadDocuments.java b/writerfilter/qa/complex/ooxml/LoadDocuments.java
index acbbdb6..7515f8d 100644
--- a/writerfilter/qa/complex/ooxml/LoadDocuments.java
+++ b/writerfilter/qa/complex/ooxml/LoadDocuments.java
@@ -22,15 +22,6 @@ import complexlib.ComplexTestCase;
import java.io.File;
import com.sun.star.text.XTextDocument;
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- *
- * @author hb137859
- */
public class LoadDocuments extends ComplexTestCase {
private XMultiServiceFactory m_xMSF;
commit 3be15a051444d4d2f805d95e27831d5f466c1497
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Fri Nov 23 23:59:10 2012 +0100
Removed horizontal rule ugly 1990 thing
Change-Id: Ifafd8b2ffd9af90b6ac4ed2ee0ccd3c5e980731c
Conflicts:
sw/source/ui/misc/insrule.cxx
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index eb5a07d..3165980 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Zip_gallbullets \
Zip_gallhtmlexpo \
Zip_gallroot \
- Zip_gallrulers \
Zip_gallsound \
Zip_gallsounds \
Zip_gallsystem \
diff --git a/extras/Zip_gallrulers.mk b/extras/Zip_gallrulers.mk
deleted file mode 100644
index 8182069..0000000
--- a/extras/Zip_gallrulers.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,gallrulers,$(SRCDIR)/extras/source/gallery/rulers))
-
-$(eval $(call gb_Zip_add_files,gallrulers,\
- blkballs.gif \
- blurulr1.gif \
- blurulr2.gif \
- blurulr3.gif \
- blurulr4.gif \
- blurulr5.gif \
- blurulr6.gif \
- gldballs.gif \
- grnballs.gif \
- grnrulr1.gif \
- grnrulr2.gif \
- grnrulr3.gif \
- grnrulr4.gif \
- gryrulr1.gif \
- gryrulr2.gif \
- gryrulr3.gif \
- orgrulr1.gif \
- redrulr1.gif \
- redrulr2.gif \
- redrulr3.gif \
- redrulr4.gif \
- redrulr5.gif \
- striped.gif \
- whtballs.gif \
- ylwrulr1.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallsystem.mk b/extras/Zip_gallsystem.mk
index ec77152..bb55713 100644
--- a/extras/Zip_gallsystem.mk
+++ b/extras/Zip_gallsystem.mk
@@ -19,9 +19,6 @@ $(eval $(call gb_Zip_add_files,gallsystem,\
sg25.sdg \
sg25.sdv \
sg25.thm \
- sg2.sdg \
- sg2.sdv \
- sg2.thm \
sg36.sdg \
sg36.sdv \
sg36.thm \
diff --git a/extras/source/gallery/gallery_system/sg2.sdg b/extras/source/gallery/gallery_system/sg2.sdg
deleted file mode 100644
index dd045f2..0000000
Binary files a/extras/source/gallery/gallery_system/sg2.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg2.sdv b/extras/source/gallery/gallery_system/sg2.sdv
deleted file mode 100644
index fc17dd9..0000000
Binary files a/extras/source/gallery/gallery_system/sg2.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg2.thm b/extras/source/gallery/gallery_system/sg2.thm
deleted file mode 100644
index 79d1cdd..0000000
Binary files a/extras/source/gallery/gallery_system/sg2.thm and /dev/null differ
diff --git a/extras/source/gallery/rulers/blkballs.gif b/extras/source/gallery/rulers/blkballs.gif
deleted file mode 100644
index 5854549..0000000
Binary files a/extras/source/gallery/rulers/blkballs.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr1.gif b/extras/source/gallery/rulers/blurulr1.gif
deleted file mode 100644
index 3fac0a9..0000000
Binary files a/extras/source/gallery/rulers/blurulr1.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr2.gif b/extras/source/gallery/rulers/blurulr2.gif
deleted file mode 100644
index 91ada2d..0000000
Binary files a/extras/source/gallery/rulers/blurulr2.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr3.gif b/extras/source/gallery/rulers/blurulr3.gif
deleted file mode 100644
index 075743a..0000000
Binary files a/extras/source/gallery/rulers/blurulr3.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr4.gif b/extras/source/gallery/rulers/blurulr4.gif
deleted file mode 100644
index 5fdfb6e..0000000
Binary files a/extras/source/gallery/rulers/blurulr4.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr5.gif b/extras/source/gallery/rulers/blurulr5.gif
deleted file mode 100644
index 3352047..0000000
Binary files a/extras/source/gallery/rulers/blurulr5.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/blurulr6.gif b/extras/source/gallery/rulers/blurulr6.gif
deleted file mode 100644
index d4ebdce..0000000
Binary files a/extras/source/gallery/rulers/blurulr6.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/gldballs.gif b/extras/source/gallery/rulers/gldballs.gif
deleted file mode 100644
index 9b0e5b0..0000000
Binary files a/extras/source/gallery/rulers/gldballs.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/grnballs.gif b/extras/source/gallery/rulers/grnballs.gif
deleted file mode 100644
index 6a1aa5c..0000000
Binary files a/extras/source/gallery/rulers/grnballs.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/grnrulr1.gif b/extras/source/gallery/rulers/grnrulr1.gif
deleted file mode 100644
index 482395c..0000000
Binary files a/extras/source/gallery/rulers/grnrulr1.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/grnrulr2.gif b/extras/source/gallery/rulers/grnrulr2.gif
deleted file mode 100644
index a06aa22..0000000
Binary files a/extras/source/gallery/rulers/grnrulr2.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/grnrulr3.gif b/extras/source/gallery/rulers/grnrulr3.gif
deleted file mode 100644
index 9fed832..0000000
Binary files a/extras/source/gallery/rulers/grnrulr3.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/grnrulr4.gif b/extras/source/gallery/rulers/grnrulr4.gif
deleted file mode 100644
index 92a25cb..0000000
Binary files a/extras/source/gallery/rulers/grnrulr4.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/gryrulr1.gif b/extras/source/gallery/rulers/gryrulr1.gif
deleted file mode 100644
index b424d09..0000000
Binary files a/extras/source/gallery/rulers/gryrulr1.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/gryrulr2.gif b/extras/source/gallery/rulers/gryrulr2.gif
deleted file mode 100644
index c14edbe..0000000
Binary files a/extras/source/gallery/rulers/gryrulr2.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/gryrulr3.gif b/extras/source/gallery/rulers/gryrulr3.gif
deleted file mode 100644
index 82d498e..0000000
Binary files a/extras/source/gallery/rulers/gryrulr3.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/orgrulr1.gif b/extras/source/gallery/rulers/orgrulr1.gif
deleted file mode 100644
index bf56d93..0000000
Binary files a/extras/source/gallery/rulers/orgrulr1.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/redrulr1.gif b/extras/source/gallery/rulers/redrulr1.gif
deleted file mode 100644
index 54931bc..0000000
Binary files a/extras/source/gallery/rulers/redrulr1.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/redrulr2.gif b/extras/source/gallery/rulers/redrulr2.gif
deleted file mode 100644
index 5b26382..0000000
Binary files a/extras/source/gallery/rulers/redrulr2.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/redrulr3.gif b/extras/source/gallery/rulers/redrulr3.gif
deleted file mode 100644
index 572114c..0000000
Binary files a/extras/source/gallery/rulers/redrulr3.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/redrulr4.gif b/extras/source/gallery/rulers/redrulr4.gif
deleted file mode 100644
index a27624b..0000000
Binary files a/extras/source/gallery/rulers/redrulr4.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/redrulr5.gif b/extras/source/gallery/rulers/redrulr5.gif
deleted file mode 100644
index d5b1081..0000000
Binary files a/extras/source/gallery/rulers/redrulr5.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/striped.gif b/extras/source/gallery/rulers/striped.gif
deleted file mode 100644
index 2c1313e..0000000
Binary files a/extras/source/gallery/rulers/striped.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/whtballs.gif b/extras/source/gallery/rulers/whtballs.gif
deleted file mode 100644
index 279be20..0000000
Binary files a/extras/source/gallery/rulers/whtballs.gif and /dev/null differ
diff --git a/extras/source/gallery/rulers/ylwrulr1.gif b/extras/source/gallery/rulers/ylwrulr1.gif
deleted file mode 100644
index 07bf5a9..0000000
Binary files a/extras/source/gallery/rulers/ylwrulr1.gif and /dev/null differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7e2052e..b1a231d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,11 +55,6 @@
<value xml:lang="en-US">S~cript...</value>
</prop>
</node>
- <node oor:name=".uno:InsertGraphicRuler" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hori~zontal Rule...</value>
- </prop>
- </node>
<node oor:name=".uno:SetAnchorAtChar" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Anchor to Character</value>
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 1d762b0..5ba170b 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -258,12 +258,6 @@ File gid_File_Extra_Gallroot
Name = "gallroot.zip";
End
-File gid_File_Extra_Gallrulers
- Dir = gid_Dir_Gallery_Rulers;
- ARCHIVE_TXT_FILE_BODY;
- Name = "gallrulers.zip";
-End
-
File gid_File_Extra_Gallsound
Dir = gid_Dir_User_Gallery;
USER_FILE_BODY;
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 90b05ab..628688f 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -45,7 +45,6 @@
#define RID_GALLERYSTR_THEME_SURFACES (RID_GALLERYSTR_THEME_START + 14)
#define RID_GALLERYSTR_THEME_HTMLBUTTONS (RID_GALLERYSTR_THEME_START + 15)
#define RID_GALLERYSTR_THEME_POWERPOINT (RID_GALLERYSTR_THEME_START + 16)
-#define RID_GALLERYSTR_THEME_RULERS (RID_GALLERYSTR_THEME_START + 17)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
#define RID_GALLERYSTR_THEME_SYMBOLS (RID_GALLERYSTR_THEME_START + 19)
#define RID_GALLERYSTR_THEME_MYTHEME (RID_GALLERYSTR_THEME_START + 20)
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index a42dc62..39679e9 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -55,7 +55,6 @@
#define GALLERY_THEME_HOMEPAGE 10
#define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT 16
-#define GALLERY_THEME_RULERS 17
#define GALLERY_THEME_SOUNDS 18
#define GALLERY_THEME_USERSOUNDS 21
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 856a929..923aa32 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -508,9 +508,6 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
case( GALLERY_THEME_FONTWORK_VERTICAL ):
aFallback = "private://gallery/hidden/fontworkvertical";
break;
- case( GALLERY_THEME_RULERS ):
- aFallback = "Rulers";
- break;
case( GALLERY_THEME_SOUNDS ):
aFallback = "Sounds";
break;
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 2db8a1e..07b47d3 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -143,13 +143,6 @@ String RID_GALLERYSTR_THEME_POWERPOINT
// -----------------------------------------------------------------------------
-String RID_GALLERYSTR_THEME_RULERS
-{
- Text [ en-US ] = "Rulers";
-};
-
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SOUNDS
{
Text [ en-US ] = "Sounds";
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index eaa68da..f5dd9a8 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -132,7 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/misc/glosbib \
sw/source/ui/misc/glossary \
sw/source/ui/misc/insfnote \
- sw/source/ui/misc/insrule \
sw/source/ui/misc/linenum \
sw/source/ui/misc/num \
sw/source/ui/misc/outline \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 034d6b7..5c78331 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/footnotepage \
- sw/uiconfig/swriter/ui/horizontalrule \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/inserttable \
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 7bb7098..4660bae 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -297,7 +297,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_SBA_BRW_INSERT (FN_INSERT2 + 8) /* insert records into text */
#define FN_SBA_BRW_MERGE (FN_INSERT2 + 9) /* serial letter print */
#define FN_JAVAEDIT (FN_INSERT2 + 10) /* edit script field */
-#define FN_INSERT_HRULER (FN_INSERT2 + 11) /* insert horizontal ruler */
#define FN_TOOL_ANCHOR_AT_CHAR (FN_INSERT2 + 12) /* anchor object to character*/
#define FN_INSERT_PAGEHEADER (FN_INSERT2 + 13) /* insert default header */
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 6bc093c..f77e274 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -444,7 +444,6 @@ public:
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, sal_Bool bCol = sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg(Window * pParent) = 0; //add for SwInsertGrfRulerDlg
virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; //add for SwInsTableDlg
virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ) = 0; //add for SwJavaEditDialog
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index ade8718..820ce87 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -171,7 +171,6 @@ enum SwUndoId
UNDO_UI_INSERT_ENVELOPE,
UNDO_UI_DRAG_AND_COPY,
UNDO_UI_DRAG_AND_MOVE,
- UNDO_UI_INSERT_RULER,
UNDO_UI_INSERT_CHART,
UNDO_UI_INSERT_FOOTNOTE,
UNDO_UI_INSERT_URLBTN,
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index c0f1126..4a38efc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -278,11 +278,6 @@ interface BaseText
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_INSERT_HRULER // status()
- [
- ExecMethod = ExecInsert ;
- StateMethod = StateInsert ;
- ]
SID_INSERT_DIAGRAM // status(final|play)
[
ExecMethod = ExecInsert ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 3f2941b..dc8f8bc 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -4239,33 +4239,6 @@ SfxVoidItem InsertFrameInteractNoColumns FN_INSERT_FRAME_INTERACT_NOCOL
]
//--------------------------------------------------------------------------
-SfxBoolItem InsertGraphicRuler FN_INSERT_HRULER
-(SfxStringItem GraphicName FN_INSERT_HRULER,SfxBoolItem IsSimpleLine FN_PARAM_1)
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = TRUE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
-
-
-//--------------------------------------------------------------------------
SfxVoidItem InsertHyperlinkDlg FN_INSERT_HYPERLINK
()
[
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 57a56a3..02b610a 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -153,15 +153,14 @@
#define STR_INSERT_ENV_UNDO (UI_UNDO_BEGIN + 4)
#define STR_DRAG_AND_COPY (UI_UNDO_BEGIN + 5)
#define STR_DRAG_AND_MOVE (UI_UNDO_BEGIN + 6)
-#define STR_INSERT_RULER (UI_UNDO_BEGIN + 7)
-#define STR_INSERT_CHART (UI_UNDO_BEGIN + 8)
-#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 9)
-#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 10)
-#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 11)
-#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12)
-#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13)
-#define STR_DELETE_PAGE_BREAK (UI_UNDO_BEGIN + 14)
-#define STR_TEXT_CORRECTION (UI_UNDO_BEGIN + 15)
+#define STR_INSERT_CHART (UI_UNDO_BEGIN + 7)
+#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 8)
+#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 9)
+#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 10)
+#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 11)
+#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 12)
+#define STR_DELETE_PAGE_BREAK (UI_UNDO_BEGIN + 13)
+#define STR_TEXT_CORRECTION (UI_UNDO_BEGIN + 14)
#define UI_UNDO_END STR_TEXT_CORRECTION
#define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1)
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index a8104f7..52bcb79 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -137,10 +137,6 @@ String STR_DRAG_AND_MOVE
{
Text [ en-US ] = "Move: $1" ;
};
-String STR_INSERT_RULER
-{
- Text [ en-US ] = "Insert horizontal rule" ;
-};
String STR_INSERT_CHART
{
Text [ en-US ] = "Insert %PRODUCTNAME Chart" ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 51e1b80..7ed6299 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -81,7 +81,6 @@
#include <glossary.hxx> //add for SwGlossaryDlg
#include <inpdlg.hxx> //add for SwFldInputDlg
#include <insfnote.hxx> //add for SwInsFootNoteDlg
-#include <insrule.hxx> //add for SwInsertGrfRulerDlg
#include <instable.hxx> //add for SwInsTableDlg
#include <javaedit.hxx> //add for SwJavaEditDialog
#include <linenum.hxx> //add for SwLineNumberingDlg
@@ -125,7 +124,6 @@ IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl); //add for SwModalRedlin
IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFldInputDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractInsertGrfRulerDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractInsTableDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl);
@@ -421,19 +419,6 @@ void AbstractInsFootNoteDlg_Impl::SetText( const XubString& rStr )
pDlg->SetText( rStr );
}
-String AbstractInsertGrfRulerDlg_Impl::GetGraphicName()
-{
- return pDlg->GetGraphicName();
-}
-sal_Bool AbstractInsertGrfRulerDlg_Impl::IsSimpleLine()
-{
- return pDlg->IsSimpleLine();
-}
-sal_Bool AbstractInsertGrfRulerDlg_Impl::HasImages() const
-{
- return pDlg->HasImages();
-}
-
void AbstractInsTableDlg_Impl::GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt )
@@ -1230,13 +1215,6 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nRe
return 0;
}
-//add for SwInsertGrfRulerDlg
-AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg(Window * pParent)
-{
- SwInsertGrfRulerDlg* pDlg = new SwInsertGrfRulerDlg(pParent);
- return new AbstractInsertGrfRulerDlg_Impl(pDlg);
-}
-
AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView) //add for SwInsTableDlg
{
SwInsTableDlg* pDlg = new SwInsTableDlg(rView);
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index cbadc6e..e59b685 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -288,17 +288,6 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
};
//for SwInsFootNoteDlg end
-//for SwInsertGrfRulerDlg begin
-class SwInsertGrfRulerDlg;
-class AbstractInsertGrfRulerDlg_Impl : public AbstractInsertGrfRulerDlg
-{
- DECL_ABSTDLG_BASE(AbstractInsertGrfRulerDlg_Impl,SwInsertGrfRulerDlg)
- virtual String GetGraphicName();
- virtual sal_Bool IsSimpleLine();
- virtual sal_Bool HasImages() const ;
-};
-//for SwInsertGrfRulerDlg end
-
//for SwInsTableDlg begin
class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
@@ -523,7 +512,6 @@ public:
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, sal_Bool bCol = sal_False ); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg(Window * pParent); //add for SwInsertGrfRulerDlg
virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); //add for SwInsTableDlg
virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ); //add for SwJavaEditDialog
diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx
deleted file mode 100644
index 5d9f37e..0000000
--- a/sw/source/ui/inc/insrule.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _INSRULE_HXX
-#define _INSRULE_HXX
-
-#include <vector>
-
-#include "num.hxx"
-
-class SwRulerValueSet;
-class ValueSet;
-
-class SwInsertGrfRulerDlg : public SfxModalDialog
-{
- OKButton* m_pOkPB;
- SwRulerValueSet* m_pExampleVS;
-
- std::vector<OUString> m_aGrfNames;
- OUString m_sSimple;
-
-protected:
- DECL_LINK(DoubleClickHdl, void *);
-
-public:
- SwInsertGrfRulerDlg(Window* pParent);
- ~SwInsertGrfRulerDlg();
-
- OUString GetGraphicName() const;
- bool IsSimpleLine() const;
- bool HasImages() const {return !m_aGrfNames.empty();}
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
deleted file mode 100644
index 86771eb..0000000
--- a/sw/source/ui/misc/insrule.cxx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 "hintids.hxx"
-#include <svx/gallery.hxx>
-#include <vcl/msgbox.hxx>
-#include <editeng/brshitem.hxx>
-#include <svl/urihelper.hxx>
-#include <vcl/graph.hxx>
-
-#include "swtypes.hxx"
-#include "docsh.hxx"
-#include "insrule.hxx"
-#include "swvset.hxx"
-#include "app.hrc"
-#include "misc.hrc"
-#include "helpid.h"
-
-SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent )
- : SfxModalDialog(pParent, "HorizontalRuleDialog", "modules/swriter/ui/horizontalrule.ui")
- , m_sSimple(SW_RESSTR(STR_SIMPLE))
-{
- get(m_pOkPB, "ok");
- get(m_pExampleVS, "rulers");
-
- m_pExampleVS->SetLineCount(6);
- m_pExampleVS->SetColCount(1);
- m_pExampleVS->SetDoubleClickHdl(LINK(this, SwInsertGrfRulerDlg, DoubleClickHdl));
-
- // determine graphic name
- GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS);
- GalleryExplorer::FillObjList(GALLERY_THEME_RULERS, m_aGrfNames);
- m_pExampleVS->InsertItem(1, 1);
- m_pExampleVS->SetItemText(1, m_sSimple);
-
- for(sal_uInt16 i = 1; i <= m_aGrfNames.size(); ++i)
- {
- m_pExampleVS->InsertItem( i + 1, i);
- m_pExampleVS->SetItemText( i + 1, m_aGrfNames[i-1]);
- }
-
- m_pExampleVS->SelectItem(1);
-}
-
-SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
-{
- GalleryExplorer::EndLocking(GALLERY_THEME_RULERS);
-}
-
-bool SwInsertGrfRulerDlg::IsSimpleLine() const
-{
- return m_pExampleVS->GetSelectItemId() == 1;
-}
-
-OUString SwInsertGrfRulerDlg::GetGraphicName() const
-{
- sal_uInt16 nSelPos = m_pExampleVS->GetSelectItemId();
-
- sal_uInt16 nSel = nSelPos - 2; //align selection position with ValueSet index
- if(nSel < m_aGrfNames.size())
- {
- return URIHelper::SmartRel2Abs(INetURLObject(), m_aGrfNames[nSel],
- URIHelper::GetMaybeFileHdl());
- }
- return OUString();
-}
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list