[Libreoffice-commits] .: qadevOOo/Jar_OOoRunner.mk
qadevOOo/Jar_OOoRunner.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d95be4823e25a24a2d1fae92d2f6c355ef4fa96b Author: David Tardon Date: Mon Feb 20 07:29:43 2012 +0100 removal of XInplaceLayout.java was reverted later... This reverts commit e0bea132d86b417975a7b73464fb527a6c3c1cbe. diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 116622c..43a4740 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -571,6 +571,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/frame/_XFrameActionListener \ qadevOOo/tests/java/ifc/frame/_XFrameLoader \ qadevOOo/tests/java/ifc/frame/_XFramesSupplier \ +qadevOOo/tests/java/ifc/frame/_XInplaceLayout \ qadevOOo/tests/java/ifc/frame/_XLayoutManager \ qadevOOo/tests/java/ifc/frame/_XModel \ qadevOOo/tests/java/ifc/frame/_XModuleManager \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: qadevOOo/Jar_OOoRunner.mk
qadevOOo/Jar_OOoRunner.mk |1 - 1 file changed, 1 deletion(-) New commits: commit e0bea132d86b417975a7b73464fb527a6c3c1cbe Author: David Tardon Date: Mon Feb 20 07:11:47 2012 +0100 _XInplaceLayout.java is gone diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 43a4740..116622c 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -571,7 +571,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/frame/_XFrameActionListener \ qadevOOo/tests/java/ifc/frame/_XFrameLoader \ qadevOOo/tests/java/ifc/frame/_XFramesSupplier \ -qadevOOo/tests/java/ifc/frame/_XInplaceLayout \ qadevOOo/tests/java/ifc/frame/_XLayoutManager \ qadevOOo/tests/java/ifc/frame/_XModel \ qadevOOo/tests/java/ifc/frame/_XModuleManager \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - Module_tail_build.mk postprocess/prj RepositoryModule_ooo.mk
Module_tail_build.mk |1 + RepositoryModule_ooo.mk |1 + postprocess/prj/build.lst |2 +- 3 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 674af1a496d136da41b188f5920063adda120126 Author: David Tardon Date: Mon Feb 20 07:08:43 2012 +0100 add sdext to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 362434d..ae0bd01 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ sccomp \ scripting \ sd \ +sdext \ sfx2 \ slideshow \ starmath \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index aa756e5..7e590ec 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL commit 3543f791ecf7a989ea3415f920d9b64ec2fdb674 Author: David Tardon Date: Mon Feb 20 07:05:21 2012 +0100 add sdext to gbuildified modules list diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 3f0f023..e15c537 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sccomp \ scripting \ sd \ +sdext \ sfx2 \ slideshow \ sot \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild_mkdir'
New branch 'feature/gbuild_mkdir' available with the following commits: commit d44a3e291cb8c4b3ec5ce1775edd527b475ebca4 Author: Norbert Thiebaud Date: Sun Feb 19 23:46:42 2012 -0600 avoid calling mkdir for each and every command gbuild tend to call mkdir -p systematically before running any command to make sure the target directory is created. On cygwin, where fortk() is insanely expensive this is quite costly This patch use order-only rules to make sure the needed directory are created. And avoid the call to mkdir for C[++]/ObjC[++]/Yacc/GenC[++]/Link commit a8fd16804c56ad86fe97e7c9ead7c4e45cd20466 Author: Norbert Thiebaud Date: Sun Feb 19 23:42:41 2012 -0600 eol spaces clean-up ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/source svtools/inc svtools/source unusedcode.easy
sc/source/filter/excel/xename.cxx |7
sc/source/filter/excel/xlroot.cxx | 15 -
sc/source/filter/inc/xlroot.hxx|5 ---
svtools/inc/svtools/treelist.hxx | 61 +++--
svtools/source/contnr/treelist.cxx | 52 ---
unusedcode.easy|4 --
6 files changed, 58 insertions(+), 86 deletions(-)
New commits:
commit a5922eb60d1726228e71bb66bdb82ec16ed87848
Author: Santiago Martinez
Date: Sun Feb 19 19:20:54 2012 +0100
Remove unused code in XclExpName
diff --git a/sc/source/filter/excel/xename.cxx
b/sc/source/filter/excel/xename.cxx
index 0c82a08..cf2f795 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -94,8 +94,6 @@ public:
/** Returns true, if this defined name is volatile. */
boolIsVolatile() const;
-/** Returns true, if this defined name is hidden. */
-boolIsHidden() const;
/** Returns true, if this defined name describes a macro call.
@param bFunc true = Macro function; false = Macro procedure. */
boolIsMacroCall( bool bVBasic, bool bFunc ) const;
@@ -306,11 +304,6 @@ bool XclExpName::IsVolatile() const
return mxTokArr && mxTokArr->IsVolatile();
}
-bool XclExpName::IsHidden() const
-{
-return ::get_flag( mnFlags, EXC_NAME_HIDDEN );
-}
-
bool XclExpName::IsMacroCall( bool bVBasic, bool bFunc ) const
{
return
diff --git a/unusedcode.easy b/unusedcode.easy
index afeba1d..b160c03 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -549,7 +549,6 @@ XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned
short, rtl::OUString
XWindowItem::XWindowItem(unsigned short, Window*)
XWindowItem::XWindowItem(unsigned short,
com::sun::star::uno::Reference&)
XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
-XclExpName::IsHidden() const
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
XclExpString::SetFormats(std::__debug::vector > const&)
XclTokenArray::XclTokenArray(std::__debug::vector >&, bool)
commit 20d6c4d4e952765ef7938f9e6d9135fb067076a5
Author: Santiago Martinez
Date: Sun Feb 19 18:26:38 2012 +0100
Remove unused code in XclRoot.
diff --git a/sc/source/filter/excel/xlroot.cxx
b/sc/source/filter/excel/xlroot.cxx
index 21e8a70..0177ce4 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -247,16 +247,6 @@ sal_Int32 XclRoot::GetHmmFromPixelY( double fPixelY ) const
return static_cast< sal_Int32 >( fPixelY * mrData.mfScreenPixelY + 0.5 );
}
-double XclRoot::GetPixelXFromHmm( sal_Int32 nX ) const
-{
-return static_cast< double >( (nX - 0.5) / mrData.mfScreenPixelX );
-}
-
-double XclRoot::GetPixelYFromHmm( sal_Int32 nY ) const
-{
-return static_cast< double >( (nY - 0.5) / mrData.mfScreenPixelY );
-}
-
uno::Sequence< beans::NamedValue > XclRoot::RequestEncryptionData(
::comphelper::IDocPasswordVerifier& rVerifier ) const
{
::std::vector< OUString > aDefaultPasswords;
@@ -320,11 +310,6 @@ ScRangeName& XclRoot::GetNamedRanges() const
return *GetDoc().GetRangeName();
}
-ScDBCollection& XclRoot::GetDatabaseRanges() const
-{
-return *GetDoc().GetDBCollection();
-}
-
SdrPage* XclRoot::GetSdrPage( SCTAB nScTab ) const
{
return ((nScTab >= 0) && GetDoc().GetDrawLayer()) ?
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 20eb819..0a652ba 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -188,9 +188,6 @@ public:
/** Calculates the height of the passed number of pixels in 1/100 mm. */
sal_Int32 GetHmmFromPixelY( double fPixelY ) const;
-double GetPixelXFromHmm( sal_Int32 nX ) const;
-double GetPixelYFromHmm( sal_Int32 nY ) const;
-
/** Returns the medium to import from. */
inline SfxMedium& GetMedium() const { return mrData.mrMedium; }
/** Returns the document URL of the imported/exported file. */
@@ -235,8 +232,6 @@ public:
ScStyleSheetPool& GetStyleSheetPool() const;
/** Returns the defined names container of the Calc document. */
ScRangeName&GetNamedRanges() const;
-/** Returns the database ranges container of the Calc document. */
-ScDBCollection& GetDatabaseRanges() const;
/** Returns the drawing layer page of the passed sheet, if present. */
SdrPage*GetSdrPage( SCTAB nScTab ) const;
diff --git a/unusedcode.easy b/unusedcode.easy
index eb5cec5..afeba1d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -552,9 +552,6 @@ XclExpFontBuffer::Insert(ScPatternAttr const&, short,
XclExpColorType, bool)
XclExpName::IsHidden() const
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
XclExpString::SetFormats(std::__debug::vector > const&)
-XclRoot::GetDatabaseRanges() const
-XclRoot::GetPixelXFromHmm(int) const
-XclRoot::GetPixelYFro
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: smoketest/Library_smoketest.mk smoketest/Module_smoketest.mk
smoketest/Library_smoketest.mk | 48 + smoketest/Module_smoketest.mk |1 2 files changed, 49 insertions(+) New commits: commit cfae02e4c4f018ed9761fff7930a845b3b06114a Author: Matúš Kukan Date: Mon Feb 20 02:37:42 2012 +0100 we do want also create library for smoketest and deliver it diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk new file mode 100644 index 000..80b7de0 --- /dev/null +++ b/smoketest/Library_smoketest.mk @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Matúš Kukan (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,smoketest)) + +$(eval $(call gb_Library_add_api,smoketest,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,smoketest,\ + cppu \ + cppuhelper \ + sal \ + unotest \ +)) + +$(eval $(call gb_Library_use_external,smoketest,cppunit)) + +$(eval $(call gb_Library_add_exception_objects,smoketest,\ + smoketest/smoketest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 0ef1c52..9de8a44 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,smoketest)) ifeq ($(CROSS_COMPILING),) $(eval $(call gb_Module_add_targets,smoketest,\ + Library_smoketest \ Package_losmoketest \ Zip_smoketestdoc \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/qa test/inc test/source
sc/qa/extras/scdatabaserangeobj.cxx |3 -
sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods |binary
test/inc/test/sheet/xdatabaserange.hxx|1
test/source/sheet/xdatabaserange.cxx | 47 ++
test/source/sheet/xspreadsheets2.cxx |2
5 files changed, 51 insertions(+), 2 deletions(-)
New commits:
commit d9653ee2f3bc1f77a31df6978e9d4ed4e74dbfb0
Author: Markus Mohrhard
Date: Sun Feb 19 15:50:32 2012 +0100
add testRefresh to ScDatabaseRangeObj, related fdo#44167
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx
b/sc/qa/extras/scdatabaserangeobj.cxx
index e9f09c6..03cf4d5 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -37,7 +37,7 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 5
+#define NUMBER_OF_TESTS 6
class ScDatabaseRangeObj : public UnoApiTest, apitest::XDatabaseRange
{
@@ -53,6 +53,7 @@ public:
CPPUNIT_TEST(testGetSubtotalDescriptor);
CPPUNIT_TEST(testGetImportDescriptor);
CPPUNIT_TEST(testGetFilterDescriptor);
+CPPUNIT_TEST(testRefresh);
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
diff --git a/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods
b/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods
index 0561655..48f001c 100644
Binary files a/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods and
b/sc/qa/extras/testdocuments/ScDatabaseRangeObj.ods differ
commit 92009abe68c180aa3c66b5159e3324665cf3c709
Author: Markus Mohrhard
Date: Sun Feb 19 15:49:35 2012 +0100
add testRefresh to XDatabaseRange
XDatabase range test case is now finished
diff --git a/test/inc/test/sheet/xdatabaserange.hxx
b/test/inc/test/sheet/xdatabaserange.hxx
index d388aa3..3e38056 100644
--- a/test/inc/test/sheet/xdatabaserange.hxx
+++ b/test/inc/test/sheet/xdatabaserange.hxx
@@ -45,6 +45,7 @@ public:
void testGetSubtotalDescriptor();
void testGetImportDescriptor();
void testGetFilterDescriptor();
+void testRefresh();
};
}
diff --git a/test/source/sheet/xdatabaserange.cxx
b/test/source/sheet/xdatabaserange.cxx
index 51e3c32..486f09f 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -37,6 +37,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include
#include "cppunit/extensions/HelperMacros.h"
@@ -153,6 +157,49 @@ void XDatabaseRange::testGetImportDescriptor()
uno::Sequence< beans::PropertyValue > xImportDescr =
xDBRange->getImportDescriptor();
}
+void XDatabaseRange::testRefresh()
+{
+uno::Reference< sheet::XDatabaseRange > xDBRange(
init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Refresh"))), UNO_QUERY_THROW);
+
+const sal_Int32 nCol = 0;
+rtl::OUString aHidden(RTL_CONSTASCII_USTRINGPARAM("IsVisible"));
+uno::Reference< sheet::XCellRangeReferrer > xCellRangeReferrer(xDBRange,
UNO_QUERY_THROW);
+uno::Reference< table::XCellRange > xCellRange =
xCellRangeReferrer->getReferredCells();
+
+for (sal_Int32 i = 1; i < 5; ++i)
+{
+uno::Reference< table::XCell > xCell =
xCellRange->getCellByPosition(nCol, i);
+xCell->setValue(0);
+}
+
+for (sal_Int32 i = 2; i < 5; ++i)
+{
+uno::Reference< table::XColumnRowRange > xColRowRange(xCellRange,
UNO_QUERY_THROW);
+uno::Reference< table::XTableRows > xRows = xColRowRange->getRows();
+uno::Reference< table::XCellRange > xRow(xRows->getByIndex(i),
UNO_QUERY_THROW);
+uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW);
+Any aAny = xPropRow->getPropertyValue( aHidden );
+
+CPPUNIT_ASSERT( aAny.get() == true);
+}
+
+xDBRange->refresh();
+std::cout << "after refresh" << std::endl;
+
+for (sal_Int32 i = 1; i < 5; ++i)
+{
+uno::Reference< table::XColumnRowRange > xColRowRange(xCellRange,
UNO_QUERY_THROW);
+uno::Reference< table::XTableRows > xRows = xColRowRange->getRows();
+uno::Reference< table::XCellRange > xRow(xRows->getByIndex(i),
UNO_QUERY_THROW);
+uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW);
+Any aAny = xPropRow->getPropertyValue( aHidden );
+
+CPPUNIT_ASSERT( aAny.get() == false);
+}
+
+
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e521ac1a7304dead6557b15ecc24ee60be93cc48
Author: Markus Mohrhard
Date: Sun Feb 19 15:02:27 2012 +0100
this test uses ScNamedRangeObj.ods too
TODO: remove the explicit test file dependency from the interface test
code
don't use one of the test files for another class
diff --git a/test/source/sheet/xspreadsheets2.cxx
b/test/source/sheet/xspreadsheets2.cxx
index 6fbf35b..18f024b 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -60,7 +60,7 @@ namespace apitest {
XSpreadsheets2::XSpreadsheets2():
aSrcSheetName(RTL_CONSTASCII_U
[Libreoffice-commits] .: bug/bug.xhtml
bug/bug.xhtml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b39f528327d4464d2d32afcf580f8a817eb204ac Author: Loic Dachary Date: Sun Feb 19 23:26:08 2012 +0100 Replace "Formula editor" with "Formula Editor" because case matters and prevents fetching information from https://wiki.documentfoundation.org/Template:BugzAssHlp_Formula_Editor diff --git a/bug/bug.xhtml b/bug/bug.xhtml index d550255..0e9c073 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -120,7 +120,7 @@ - + &component_comments; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/Module_officecfg.mk
officecfg/Module_officecfg.mk | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit e69b8a758061c695b4daa9029f58a1cd7f715ef6 Author: Norbert Thiebaud Date: Sun Feb 19 15:36:07 2012 -0600 disabled officecfg unittest due to dependencies problems diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index 382992e..4a0dc8d 100644 --- a/officecfg/Module_officecfg.mk +++ b/officecfg/Module_officecfg.mk @@ -26,9 +26,13 @@ $(eval $(call gb_Module_add_targets,officecfg,\ Configuration_officecfg \ )) +# this does not work, subsequenttest s a runtime dep, that is it postpone the run of the unittest, not the build of it +# and that test need a bunch of include that are not there and there is no rule to teach make about the +# dependency of these generated headers +# disabled for now # The cppheader test depends on comphelper so can only be a subsequentcheck: -$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ -CppunitTest_officecfg_cppheader_test \ -)) +#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ +#CppunitTest_officecfg_cppheader_test \ +#)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee7f6aaa95c39ce062cc6c2aff6416442f5ebd90 Author: Matúš Kukan Date: Sun Feb 19 20:31:56 2012 +0100 Add missing $ diff --git a/configure.in b/configure.in index d9a75ca..50a9b97 100644 --- a/configure.in +++ b/configure.in @@ -1977,7 +1977,7 @@ pathmunge () else new_path="$1" fi -if ! echo LO_PATH | $EGREP -q "(^|:)$1($|:)" ; then +if ! echo "$LO_PATH" | $EGREP -q "(^|:)$1($|:)" ; then if test "$2" = "after" ; then LO_PATH="$LO_PATH:$new_path" else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_goodies binfilter/inc
binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx |1 -
binfilter/inc/bf_goodies/graphicobject.hxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 2487d06a7f873a7a4a74d968e702152338d6ebfc
Author: Thomas Arnhold
Date: Sun Feb 19 19:50:48 2012 +0100
remove GetReleaseFromCache
diff --git a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
index adcd27e..3cb549e 100644
--- a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
+++ b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
@@ -37,7 +37,6 @@ namespace binfilter {
namespace binfilter {
TYPEINIT1_AUTOFACTORY( BfGraphicObject, GraphicObject);
void BfGraphicObject::GraphicManagerDestroyed() {
GraphicObject::GraphicManagerDestroyed(); }
-ULONG BfGraphicObject::GetReleaseFromCache() const { return
GraphicObject::GetReleaseFromCache(); }
SvStream* BfGraphicObject::GetSwapStream() const { return
GraphicObject::GetSwapStream(); }
void BfGraphicObject::Load( SvStream& rSt ) { GraphicObject::Load(rSt); }
void BfGraphicObject::Assign( const SvDataCopyStream& rSt ) {
GraphicObject::Assign(rSt); }
diff --git a/binfilter/inc/bf_goodies/graphicobject.hxx
b/binfilter/inc/bf_goodies/graphicobject.hxx
index 6254e04..4aa803b 100644
--- a/binfilter/inc/bf_goodies/graphicobject.hxx
+++ b/binfilter/inc/bf_goodies/graphicobject.hxx
@@ -52,7 +52,6 @@ namespace binfilter {
{
protected:
virtual void GraphicManagerDestroyed();
-virtual ULONG GetReleaseFromCache() const;
virtual SvStream* GetSwapStream() const;
virtual void Load( SvStream& );
virtual void Save( SvStream& ) {};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 10 commits - android/qa configmgr/source Library_merged.mk Makefile Module_tail_build.mk postprocess/prj Repository.mk RepositoryModule_ooo.mk smoketest/com smoketest/CppunitT
Library_merged.mk |2 Makefile| 32 ++--- Module_tail_build.mk|6 + Repository.mk |1 RepositoryModule_ooo.mk |1 android/qa/desktop/Makefile |3 android/qa/sc/Makefile |3 configmgr/source/configmgr.component|2 configmgr/source/services.cxx |2 postprocess/prj/build.lst |2 smoketest/CppunitTest_smoketest.mk | 71 smoketest/Jar_TestExtension.mk | 52 + smoketest/Makefile |7 + smoketest/Module_smoketest.mk | 50 + smoketest/Package_losmoketest.mk| 32 + smoketest/README|1 smoketest/Zip_TestExtension.mk | 48 smoketest/Zip_smoketestdoc.mk | 69 smoketest/com/sun/star/comp/smoketest/TestExtension.idl | 40 --- smoketest/com/sun/star/comp/smoketest/delzip|1 smoketest/com/sun/star/comp/smoketest/makefile.mk | 88 smoketest/com/sun/star/comp/smoketest/manifest.xml |1 smoketest/data/makefile.mk | 70 smoketest/makefile.mk | 47 smoketest/prj/build.lst |6 - smoketest/prj/d.lst |4 smoketest/prj/makefile.mk |1 smoketestoo_native/README |1 smoketestoo_native/makefile.mk | 62 --- smoketestoo_native/prj/build.lst|2 solenv/gbuild/CppunitTest.mk| 21 +++ solenv/gbuild/Library.mk| 14 +- solenv/gbuild/Zip.mk| 12 ++ solenv/gbuild/extensions/pre_MergedLibsList.mk |4 svx/Executable_gengal.bin.mk|2 tail_build/prj/build.lst|2 ucb/source/core/ucb1.component |2 ucb/source/core/ucbserv.cxx |2 ucb/source/ucp/file/prov.cxx|2 ucb/source/ucp/file/ucpfile1.component |2 40 files changed, 407 insertions(+), 363 deletions(-) New commits: commit e5147229c7cf615a107faeb30cd222c51f7f2407 Author: Matúš Kukan Date: Sun Feb 19 19:49:57 2012 +0100 fix MinGW build diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 3143e5f..1f080fb 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,7 +71,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ kernel32 \ msvcrt \ -oldnames \ +$(gb_Library_win32_OLDNAMES) \ user32 \ uwinapi \ )) commit b1a87ca7840ab4ed17e8a775fcd4726c2fc5b75d Author: Matúš Kukan Date: Sun Feb 19 00:15:27 2012 +0100 fix handling of component files in mergelibs mode diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 1b7a2aa..31c3e43 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -105,15 +105,19 @@ endef # But the component target also must be delivered, so a new phony target # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile -$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\ - $(call gb_Library_get_runtime_filename,$(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1 -$(call gb_Library__get_final_target,$(1)) : \ +$(call gb_ComponentTarget_ComponentTarget,$(2),\ + $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\ + $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) +$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) -$(call gb_ComponentTarget_get_target,$(2)) :| $(call gb_Library_get_target,$(1)) -$(call gb_Library_get_clean_target,$(1)) : \ +$(call gb_ComponentTarget_get_target,$(2)) :| \ + $(call gb_Library_get_target,$(gb_Library__get_name)) +$(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef +gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1)) + gb_Library__get_componentprefix = \ $(call gb_Library__get_layer_componentprefix,$(call \ gb_Library_get_layer,$(1))) commi
[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source vcl/inc
svtools/inc/svtools/grfmgr.hxx|3 ---
svtools/source/graphic/grfmgr.cxx |6 --
vcl/inc/salframe.hxx | 10 --
3 files changed, 19 deletions(-)
New commits:
commit 02192b8366c9301ab168770963a88292f4051f52
Author: Thomas Arnhold
Date: Sun Feb 19 17:20:54 2012 +0100
svtools: remove unused GraphicObject::GetReleaseFromCache
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 896a475..edb3db1 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -346,9 +346,6 @@ protected:
virtual voidGraphicManagerDestroyed();
virtual SvStream* GetSwapStream() const;
-// !!! to be removed
-virtual sal_uLong GetReleaseFromCache() const;
-
virtual voidLoad( SvStream& );
virtual voidSave( SvStream& );
virtual voidAssign( const SvDataCopyStream& );
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 28fc1c9..7c2de86 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -393,12 +393,6 @@ SvStream* GraphicObject::GetSwapStream() const
return( HasSwapStreamHdl() ? (SvStream*) mpSwapStreamHdl->Call( (void*)
this ) : GRFMGR_AUTOSWAPSTREAM_NONE );
}
-// !!! to be removed
-sal_uLong GraphicObject::GetReleaseFromCache() const
-{
-return 0;
-}
-
void GraphicObject::SetAttr( const GraphicAttr& rAttr )
{
maAttr = rAttr;
commit 2e54f4ff0fe12846a52d0cbbd3404f115d515811
Author: Thomas Arnhold
Date: Sun Feb 19 10:31:40 2012 +0100
vcl: dead code
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f4c3d73..4c412b7 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -103,16 +103,6 @@ struct SystemEnvData;
// the window containing the intro bitmap, aka splashscreen
#define SAL_FRAME_STYLE_INTRO ((sal_uLong)0x8000)
-/*
-#define SAL_FRAME_STYLE_MINABLE ((sal_uLong)0x0008)
-#define SAL_FRAME_STYLE_MAXABLE ((sal_uLong)0x0010)
-#define SAL_FRAME_STYLE_BORDER ((sal_uLong)0x0040)
-#define SAL_FRAME_STYLE_DOC ((sal_uLong)0x4000)
-#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x8000)
-#define SAL_FRAME_STYLE_TOOL((sal_uLong)0x0001)
-#define SAL_FRAME_STYLE_FULLSIZE((sal_uLong)0x0002)
-*/
-
//
// - extended frame style -
// - (sal equivalent to extended WinBits) -
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - icu/arm-assembler.patch icu/makefile.mk Repository.mk svx/Executable_gengal.bin.mk
Repository.mk|1 +
icu/arm-assembler.patch | 24
icu/makefile.mk |3 ++-
svx/Executable_gengal.bin.mk | 23 +++
4 files changed, 42 insertions(+), 9 deletions(-)
New commits:
commit fdfaf2cd8488d0d527993672db9407307eab39aa
Author: Caolán McNamara
Date: Sun Feb 19 15:51:34 2012 +
fix windows build, gengal.bin should be gengal.exe there according to scp2
diff --git a/Repository.mk b/Repository.mk
index 5df6c87..daa6d2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -52,6 +52,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_executables,OOO,\
crashrep_com \
+ gengal \
guiloader \
guistdio \
odbcconfig \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 36f7752..3143e5f 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -25,9 +25,16 @@
#
#*
-$(eval $(call gb_Executable_Executable,gengal.bin))
+ifeq ($(OS),WNT)
+gengalbin := gengal
+else
+gengalbin := gengal.bin
+endif
+
+
+$(eval $(call gb_Executable_Executable,$(gengalbin)))
-$(eval $(call gb_Executable_set_include,gengal.bin,\
+$(eval $(call gb_Executable_set_include,$(gengalbin),\
$$(INCLUDE) \
-I$(SRCDIR)/svx/inc/ \
-I$(SRCDIR)/svx/inc/pch \
@@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\
-I$(OUTDIR)/inc/offapi \
))
-$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
$$(CXXFLAGS) \
))
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
sal \
tl \
svl \
@@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
svxcore \
))
-$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
svx/source/gengal/gengal \
))
-$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\
vclmain \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
kernel32 \
msvcrt \
oldnames \
@@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
dl \
pthread \
))
commit 30d5fa85a2fadd473d82fe76445840393ac6bf8d
Author: Rene Engelhard
Date: Fri Feb 17 15:37:20 2012 +0100
fix icu build on arm
(from
http://patch-tracker.debian.org/patch/series/view/icu/4.4.1-7/arm-assembler.patch)
diff --git a/icu/arm-assembler.patch b/icu/arm-assembler.patch
new file mode 100644
index 000..752f9ad
--- /dev/null
+++ b/icu/arm-assembler.patch
@@ -0,0 +1,24 @@
+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
+===
+--- misc/icu/source/tools/toolutil/pkg_genc.c 2010-04-28 11:27:46.0
-0400
misc/build/icu/source/tools/toolutil/pkg_genc.c2010-07-17
07:31:54.408752610 -0400
+@@ -1,5 +1,5 @@
+
/**
+- * Copyright (C) 2009, International Business Machines
++ * Copyright (C) 2009-2010, International Business Machines
+ * Corporation and others. All Rights Reserved.
+
***
+ */
+@@ -118,10 +118,10 @@
+ } assemblyHeader[] = {
+ {"gcc",
+ ".globl %s\n"
+-"\t.section .note.GNU-stack,\"\",@progbits\n"
++"\t.section .note.GNU-stack,\"\",%%progbits\n"
+ "\t.section .rodata\n"
+ "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is
needed. */
+-"\t.type %s,@object\n"
++"\t.type %s,%%object\n"
+ "%s:\n\n",
+
+ ".long ","",HEX_0X
diff --git a/icu/makefile.mk b/icu/makefile.mk
index cb02475..338333c 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -53,7 +53,8 @@ PATCH_FILES=\
icu4c-warnings.patch \
icu4c-escapespace.patch \
icu4c-strict-c.patch \
-CVE-2011-4599.patch
+CVE-2011-4599.patch \
+arm-assembler.patch
.IF "$(OS)"=="ANDROID"
PATCH_FILES+=\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk svx/Executable_gengal.bin.mk
Repository.mk|1 + svx/Executable_gengal.bin.mk | 23 +++ 2 files changed, 16 insertions(+), 8 deletions(-) New commits: commit 998e2a64971516a2a77d34c1246a98e859a3e223 Author: Caolán McNamara Date: Sun Feb 19 15:51:34 2012 + fix windows build, gengal.bin should be gengal.exe there according to scp2 diff --git a/Repository.mk b/Repository.mk index 71697e1..35ded73 100644 --- a/Repository.mk +++ b/Repository.mk @@ -58,6 +58,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ crashrep_com \ + gengal \ guiloader \ guistdio \ odbcconfig \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 36f7752..3143e5f 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -25,9 +25,16 @@ # #* -$(eval $(call gb_Executable_Executable,gengal.bin)) +ifeq ($(OS),WNT) +gengalbin := gengal +else +gengalbin := gengal.bin +endif + + +$(eval $(call gb_Executable_Executable,$(gengalbin))) -$(eval $(call gb_Executable_set_include,gengal.bin,\ +$(eval $(call gb_Executable_set_include,$(gengalbin),\ $$(INCLUDE) \ -I$(SRCDIR)/svx/inc/ \ -I$(SRCDIR)/svx/inc/pch \ @@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\ -I$(OUTDIR)/inc/offapi \ )) -$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\ +$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\ $$(CXXFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ sal \ tl \ svl \ @@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ svxcore \ )) -$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\ +$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\ svx/source/gengal/gengal \ )) -$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\ vclmain \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ kernel32 \ msvcrt \ oldnames \ @@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ dl \ pthread \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source l10ntools/source oox/source
framework/source/dispatch/closedispatcher.cxx |2
framework/source/fwe/helper/titlehelper.cxx |6 -
framework/source/layoutmanager/layoutmanager.cxx| 83 ++--
framework/source/layoutmanager/toolbarlayoutmanager.cxx |3
l10ntools/source/tagtest.cxx| 10 -
oox/source/drawingml/chart/objectformatter.cxx |2
oox/source/drawingml/textparagraphproperties.cxx| 18 +--
oox/source/dump/dumperbase.cxx |2
oox/source/dump/pptxdumper.cxx | 34 +++---
oox/source/dump/xlsbdumper.cxx | 34 +++---
oox/source/export/drawingml.cxx |4
oox/source/mathml/importutils.cxx | 15 +-
12 files changed, 123 insertions(+), 90 deletions(-)
New commits:
commit 96cb767123c9e8f5db197454b4da02c8f7583d2b
Author: Takeshi Abe
Date: Sun Feb 19 23:27:29 2012 +0900
Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("..."))
to equalsIgnoreAsciiCaseAscii("...")
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index b595da7..2a8d20b 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -605,7 +605,7 @@ void CloseDispatcher::implts_notifyResultListener(const
css::uno::Reference< css
css::uno::Reference< css::frame::XFrame >
CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference<
css::frame::XFrame >& xFrame ,
const ::rtl::OUString& sTarget)
{
-if (sTarget.equalsIgnoreAsciiCaseAscii("_self"))
+if
(sTarget.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("_self")))
return xFrame;
OSL_ENSURE(sTarget.isEmpty(), "CloseDispatch used for unexpected target.
Magic things will happen now .-)");
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 07ff57d..c963a2b 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -197,8 +197,8 @@ void SAL_CALL TitleHelper::titleChanged(const
css::frame::TitleChangedEvent& aEv
void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject&
aEvent)
throw (css::uno::RuntimeException)
{
-if ( ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnSaveAsDone")
- && ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged"))
+if ( !
aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnSaveAsDone"))
+ && !
aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnTitleChanged")))
return;
// SYNCHRONIZED ->
@@ -211,7 +211,7 @@ void SAL_CALL TitleHelper::notifyEvent(const
css::document::EventObject& aEvent)
if (
aEvent.Source != xOwner ||
- (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") &&
!xOwner.is())
+
(aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("OnTitleChanged"))
&& !xOwner.is())
)
{
return;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 0020a2e..e25d74b 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -490,11 +490,15 @@ uno::Reference< ui::XUIElement >
LayoutManager::implts_findElement( const rtl::O
::rtl::OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
-if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
+if (
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar"))
&&
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("menubar"))
)
return m_xMenuBar;
-else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || (
m_aStatusBarElement.m_aName == aName ))
+else if ((
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar"))
&&
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("statusbar"))
) ||
+ ( m_aStatusBarElement.m_aName == aName ))
return m_aStatusBarElement.m_xUIElement;
-else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+else if (
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar"))
&&
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("progressbar"))
)
return m_aProgressBarElement.m_xUIElement;
return u
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e34e95aef33262c7aad006883e02cb76e5bb9947 Author: Miklos Vajna Date: Sun Feb 19 15:05:51 2012 +0100 configure: also, --with-lang=en-US should not trigger TRANSLATIONS build type diff --git a/configure.in b/configure.in index 00e1060..d9a75ca 100644 --- a/configure.in +++ b/configure.in @@ -10345,7 +10345,7 @@ WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"` # this variable is used only by bin/distro-install-* helper scripts # they need a real list of languages test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US" -test -z "$WITH_LANG" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS" +test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS" AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG_LIST) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 46 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 46 +++
binfilter/inc/bf_tools/string.hxx|6 +--
3 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 6c7344599885a7528a5c06a4e2a0b15e0adb35fd
Author: Caolán McNamara
Date: Sat Feb 18 21:12:34 2012 +
ditch extra ByteString code
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index b0d7279..64eef56 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -383,52 +383,6 @@ STRING& STRING::Assign( const STRCODE* pCharStr )
// ---
-STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_ASSERT( pCharStr, "String::Assign() - pCharStr is NULL" );
-
-if ( nLen == STRING_LEN )
-nLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
-if ( DbgIsAssert() )
-{
-for ( xub_StrLen i = 0; i < nLen; i++ )
-{
-if ( !pCharStr[i] )
-{
-OSL_FAIL( "String::Assign() : nLen is wrong" );
-}
-}
-}
-#endif
-
-if ( !nLen )
-{
-STRING_NEW((STRING_TYPE **)&mpData);
-}
-else
-{
-// Wenn String genauso lang ist, wie der String, dann direkt kopieren
-if ( (nLen == mpData->mnLen) && (mpData->mnRefCount == 1) )
-memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
-else
-{
-// Alte Daten loeschen
-STRING_RELEASE((STRING_TYPE *)mpData);
-
-// Daten initialisieren und String kopieren
-mpData = ImplAllocData( nLen );
-memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
-}
-}
-
-return *this;
-}
-
-// ---
-
STRING& STRING::Assign( STRCODE c )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 4657cd8..803b36e 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -627,6 +627,52 @@ STRING::STRING( const ::STRING& rStr )
mpData = temp.mpData;
}
+// ---
+
+STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
+{
+DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+DBG_ASSERT( pCharStr, "String::Assign() - pCharStr is NULL" );
+
+if ( nLen == STRING_LEN )
+nLen = ImplStringLen( pCharStr );
+
+#ifdef DBG_UTIL
+if ( DbgIsAssert() )
+{
+for ( xub_StrLen i = 0; i < nLen; i++ )
+{
+if ( !pCharStr[i] )
+{
+OSL_FAIL( "String::Assign() : nLen is wrong" );
+}
+}
+}
+#endif
+
+if ( !nLen )
+{
+STRING_NEW((STRING_TYPE **)&mpData);
+}
+else
+{
+// Wenn String genauso lang ist, wie der String, dann direkt kopieren
+if ( (nLen == mpData->mnLen) && (mpData->mnRefCount == 1) )
+memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
+else
+{
+// Alte Daten loeschen
+STRING_RELEASE((STRING_TYPE *)mpData);
+
+// Daten initialisieren und String kopieren
+mpData = ImplAllocData( nLen );
+memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
+}
+}
+
+return *this;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 872136e..6036737 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -125,10 +125,11 @@ private:
sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const sal_Unicode* pUniStr, xub_StrLen
nLen,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making somethiing to fit
+sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const UniString& rUniStr,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTF
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb7cb5b61c43ba7c78cb0a8d4aef3780df0151cd Author: Miklos Vajna Date: Sun Feb 19 14:34:10 2012 +0100 configure: no need to fetch the translations repo for --with-lang=en-US diff --git a/configure.in b/configure.in index 5d408ff..00e1060 100644 --- a/configure.in +++ b/configure.in @@ -10321,7 +10321,7 @@ AC_MSG_CHECKING([which languages to be built]) ALL_LANGS="en-US $completelangiso" # check the configured localizations WITH_LANG="$with_lang" -if test -z "$WITH_LANG"; then +if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then AC_MSG_RESULT([en-US]) else AC_MSG_RESULT([$WITH_LANG]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - autodoc/inc autodoc/source chart2/source comphelper/source connectivity/source dbaccess/source desktop/source editeng/source extensions/qa forms/source fpicker/sou
autodoc/inc/ary/info/ci_text.hxx |2 autodoc/source/display/idl/hfi_module.cxx |2 autodoc/source/display/idl/hfi_xrefpage.cxx|2 autodoc/source/display/idl/hi_factory.cxx |2 autodoc/source/exes/adc_uni/adc_cl.cxx |2 chart2/source/controller/dialogs/DialogModel.cxx |2 comphelper/source/container/container.cxx |4 connectivity/source/drivers/file/fanalyzer.cxx |2 connectivity/source/drivers/file/fcomp.cxx |4 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |2 connectivity/source/drivers/postgresql/pq_tools.hxx|2 dbaccess/source/ui/misc/WColumnSelect.cxx |2 dbaccess/source/ui/querydesign/TableConnectionData.cxx |2 desktop/source/deployment/registry/dp_backenddb.cxx|4 desktop/source/pkgchk/unopkg/unopkg_misc.cxx |2 editeng/source/misc/txtrange.cxx |2 editeng/source/outliner/outlobj.cxx|2 extensions/qa/update/test_update.cxx |2 forms/source/component/EventThread.cxx |2 fpicker/source/unx/kde_unx/UnxCommandThread.cxx|2 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx|2 lotuswordpro/source/filter/xfilter/xfindex.cxx |2 registry/tools/regcompare.cxx |4 sc/source/core/data/dociter.cxx|6 sc/source/core/data/dptablecache.cxx |2 sc/source/ui/vba/vbahyperlinks.cxx |2 sc/source/ui/view/viewdata.cxx |4 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |2 sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx |2 sdext/source/presenter/PresenterTimer.cxx |4 sdext/source/presenter/PresenterToolBar.cxx|2 shell/source/win32/simplemail/senddoc.cxx |4 shell/source/win32/simplemail/smplmailclient.cxx |2 soltools/giparser/makefile.mk |8 soltools/giparser/st_gilrw.cxx | 108 soltools/inc/st_gilrw.hxx | 127 -- starmath/source/cursor.cxx |6 starmath/source/dialog.cxx |2 starmath/source/parse.cxx |2 stoc/source/corereflection/crefl.cxx |2 stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx |2 stoc/source/tdmanager/tdmgr.cxx|2 svx/source/fmcomp/gridctrl.cxx |2 sw/source/core/SwNumberTree/SwNumberTree.cxx |2 sw/source/core/table/swnewtable.cxx|2 sw/source/ui/wrtsh/navmgr.cxx |2 ucb/source/ucp/tdoc/tdoc_storage.cxx |2 ucb/source/ucp/webdav/ContentProperties.cxx|2 ucb/source/ucp/webdav/NeonHeadRequest.cxx |2 ucb/source/ucp/webdav/NeonLockStore.cxx|2 ucb/source/ucp/webdav/NeonSession.cxx |2 vcl/generic/print/glyphset.cxx | 10 vcl/source/gdi/pdfwriter_impl.cxx |2 vcl/source/glyphs/graphite_layout.cxx |2 writerfilter/qa/cppunittests/odiapi/testProperty.cxx |4 writerfilter/source/doctok/WW8DocumentImpl.cxx |2 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 writerfilter/source/ooxml/OOXMLFastHelper.hxx |6 writerperfect/source/filter/OdgGenerator.cxx |2 xmloff/source/style/xmlnumfi.cxx |4 xmloff/source/text/txtparae.cxx|2 61 files changed, 80 insertions(+), 317 deletions(-) New commits: commit d30b4e9fb66f377295d8eeea8c1b1cf879aecdf6 Author: Elton Chung Date: Sun Feb 19 16:59:40 2012 +0400 Get rid of size() == 0 diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx index 4e8bf7a..a178ff7 100644 --- a/autodoc/inc/ary/info/
[Libreoffice-commits] .: 2 commits - l10ntools/inc l10ntools/source registry/source svl/inc svl/source svx/inc svx/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
l10ntools/inc/export.hxx |1 -
l10ntools/source/merge.cxx| 16
registry/source/keyimpl.cxx |8
registry/source/keyimpl.hxx |1 -
svl/inc/svl/zforlist.hxx |1 -
svl/source/numbers/zforlist.cxx |9 -
svx/inc/svx/svdetc.hxx|1 -
svx/source/svdraw/svdetc.cxx |5 -
unotools/inc/unotools/numberformatcodewrapper.hxx |1 -
unotools/source/i18n/numberformatcodewrapper.cxx | 16
unusedcode.easy |6 --
vcl/inc/vcl/menu.hxx |1 -
vcl/source/window/menu.cxx|9 -
13 files changed, 75 deletions(-)
New commits:
commit 1cb79c8bf9ca11f794c03407155e57fe0d893257
Author: Ivan Timofeev
Date: Sun Feb 19 15:56:02 2012 +0400
remove the function declatation as well
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 97c5bf1..ff8a679 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -426,7 +426,6 @@ public:
void Insert( PFormEntrys* pfEntrys );
PFormEntrys* GetPFObject( const rtl::OString &rPFO );
-rtl::OString Dump();
sal_Bool operator==( ResData *pData );
};
commit 37159db96ff0ce15b0b91502ba79a86f21a8f29a
Author: Petr Vorel
Date: Sat Feb 18 23:50:22 2012 +0100
Remove unused code
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index b9b8d40..55c62d1 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -129,22 +129,6 @@ void MergeData::Insert(PFormEntrys* pfEntrys )
aMap.insert( PFormEntrysHashMap::value_type(
rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) , pfEntrys ) );
}
-rtl::OString MergeData::Dump()
-{
-printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",
-sTyp.getStr(), sGID.getStr(), sLID.getStr(), sFilename.getStr());
-
-PFormEntrysHashMap::const_iterator idbg;
-for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
-{
-printf("aMap[ %s ] = " ,idbg->first.getStr());
-( (PFormEntrys*)(idbg->second) )->Dump();
-printf("\n");
-}
-printf("\n");
-return rtl::OString(RTL_CONSTASCII_STRINGPARAM("MergeData\n"));
-}
-
PFormEntrys* MergeData::GetPFObject( const rtl::OString& rPFO )
{
if( aMap.find( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) !=
aMap.end() )
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index c48ae9c..adbb49e 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -61,14 +61,6 @@ ORegKey::~ORegKey()
}
//*
-// acquireKey
-//
-RegError ORegKey::acquireKey(RegKeyHandle hKey)
-{
-return m_pRegistry->acquireKey(hKey);
-}
-
-//*
// releaseKey
//
RegError ORegKey::releaseKey(RegKeyHandle hKey)
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index a384d20..fbd9c4c 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -46,7 +46,6 @@ public:
sal_uInt32 release()
{ return --m_refCount; }
-RegErroracquireKey(RegKeyHandle hKey);
RegErrorreleaseKey(RegKeyHandle hKey);
RegErrorcreateKey(const rtl::OUString& keyName, RegKeyHandle*
phNewKey);
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index a8cca86..69645e1 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -247,7 +247,6 @@ private:
public:
-NfCurrencyEntry();
NfCurrencyEntry( const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
NfCurrencyEntry(
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 2ee058f..ca3ca49 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3798,15 +3798,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings(
NfWSStringsDtor& rStrArr
//--- NfCurrencyEntry
-NfCurrencyEntry::NfCurrencyEntry()
-: eLanguage( LANGUAGE_DONTKNOW ),
-nPositiveFormat(3),
-nNegativeFormat(8),
-nDigits(2),
-cZeroChar('0')
-{
-}
-
NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData,
LanguageType eLang )
{
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index b547289..08ba835 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -256,7 +256,6 @@ public:
OLEObjCache();
SVX_DLLPUBLIC ~OLEObjCache();
-void SetSize(sal_uIntPtr nNewSize);
void InsertObj(SdrOle2Obj* pObj);
void RemoveObj(SdrOle2Obj* pObj)
[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source svl/inc svl/source unusedcode.easy
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 10 -- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx | 27 --- basegfx/source/polygon/b2dpolygontools.cxx | 37 -- basegfx/source/polygon/b2dpolypolygontools.cxx | 26 --- svl/inc/svl/listeneriter.hxx|7 - svl/source/notify/listeneriter.cxx | 74 unusedcode.easy |9 -- 7 files changed, 190 deletions(-) New commits: commit af79fcb204efeafb48659ed4a97433b7e2cc2f84 Author: Elton Chung Date: Sun Feb 19 15:41:32 2012 +0800 Remove unused code diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index d86abb3..1bee9b3 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -130,12 +130,6 @@ namespace basegfx // if 0.0 it is calculated using getLength(...) BASEGFX_DLLPUBLIC B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0); -// get a snippet from given polygon for relative distances. The polygon is assumed -// to be opened (not closed). fFrom and fTo need to be in range [0.0 .. 1.0], where -// fTo >= fFrom. If length is given, it is assumed the correct polygon length, -// if 0.0 it is calculated using getLength(...) -BASEGFX_DLLPUBLIC B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0); - // Continuity check for point with given index BASEGFX_DLLPUBLIC B2VectorContinuity getContinuityInPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex); @@ -351,10 +345,6 @@ namespace basegfx // by several trivial sub-segments BASEGFX_DLLPUBLIC B2DPolygon createSimplifiedPolygon(const B2DPolygon&); -// calculate the distance to the given endless ray and return. The relative position on the edge is returned in Cut. -// That position may be less than 0.0 or more than 1.0 -BASEGFX_DLLPUBLIC double getDistancePointToEndlessRay(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut); - // calculate the smallest distance to given edge and return. The relative position on the edge is returned in Cut. // That position is in the range [0.0 .. 1.0] and the returned distance is adapted accordingly to the start or end // point of the edge diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx index 37d2cb5..6962596 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx @@ -78,19 +78,6 @@ namespace basegfx // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct. BASEGFX_DLLPUBLIC bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false); -/** get range of PolyPolygon. Control points are included. - -For detailed description look at getRangeWithControlPoints(const B2DPolygon&). -This method just expands by the range of every sub-Polygon. - -@param rCandidate -The B2DPolyPolygon eventually containing bezier segments - -@return -The outer range including control points -*/ -BASEGFX_DLLPUBLIC B2DRange getRangeWithControlPoints(const B2DPolyPolygon& rCandidate); - /** Get the range of a polyPolygon For detailed description look at getRange(const B2DPolygon&). @@ -241,20 +228,6 @@ namespace basegfx // #i76891# Try to remove existing curve segments if they are simply edges BASEGFX_DLLPUBLIC B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate); -/** split each edge of a polyPolygon in exactly nSubEdges equidistant edges - -@param rCandidate -The source polyPolygon. If too small (no edges), nSubEdges too small (<2) -or neither bHandleCurvedEdgesnor bHandleStraightEdges it will just be returned. -Else for each edge nSubEdges will be created. Closed state is preserved. - -@param nSubEdges -@param bHandleCurvedEdges -@param bHandleStraightEdges -Please take a look at reSegmentPolygonEdges description, these are the same. -*/ -BASEGFX_DLLPUBLIC B2DPolyPolygon reSegmentPolyPolygonEdges(const B2DPolyPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges); - // // comparators with tolerance for 2D PolyPolygons BASEGFX_DLLPUBLIC bool equal(const B2DPolyPolygon& rCan
