[Libreoffice-commits] .: basctl/Module_basctl.mk basic/Module_basic.mk config_host.mk.in configure.in Makefile postprocess/packcomponents RepositoryFixes.mk sc/Module_sc.mk scripting/Module_scripting.
Makefile |6 ++--- RepositoryFixes.mk |2 - basctl/Module_basctl.mk|2 - basic/Module_basic.mk |2 - config_host.mk.in |1 configure.in | 38 + postprocess/packcomponents/makefile.mk |2 - sc/Module_sc.mk|2 - scripting/Module_scripting.mk |2 - solenv/gbuild/CppunitTest.mk |2 - solenv/gbuild/gbuild.mk|4 +++ sw/Module_sw.mk|2 - vbahelper/Module_vbahelper.mk |2 - 13 files changed, 51 insertions(+), 16 deletions(-) New commits: commit 4c737b647078f35a2435e27d9f7f94039db9d6c3 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 10:03:18 2012 +0200 Decouple disabling of scripting (BASIC co) from OS being iOS diff --git a/Makefile b/Makefile index 68bea91..810de1d 100644 --- a/Makefile +++ b/Makefile @@ -382,12 +382,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) -ifeq ($(OS),IOS) +ifeq ($(DISABLE_INTERPRETERS),TRUE) # We must get the headers from basic and vbahelper delivered because # as we don't link to any libs from those they won't otherwise be, or # something. And we still do include those headers always even if the -# libs aren't built for iOS. (Ifdefs for iOS will be added later as -# necessary to take care of that.) +# libs aren't built in the --disable-interpreters case. (Ifdefs for +# DISABLE_INTERPRETERS will be added to the code later as necessary.) $(GNUMAKE) basic vbahelper endif ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 95602be..57946ad 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -130,7 +130,7 @@ endif # ifeq ($(COM),GCC) endif # ifeq ($(OS),WNT) -ifeq ($(OS),IOS) +ifeq (,$(filter INTERPRETERS,$(BUILD_TYPE))) gb_Library_FILENAMES := $(patsubst sb:libsb%,,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES)) diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index b61cbcd..68178ae 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,basctl)) -ifneq (IOS,$(OS)) +ifneq ($(DISABLE_INTERPRETERS),TRUE) $(eval $(call gb_Module_add_targets,basctl,\ AllLangResTarget_basctl \ diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index 7e749d0..261f6e6 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,basic)) -ifneq (IOS,$(OS)) +ifneq ($(DISABLE_INTERPRETERS),TRUE) $(eval $(call gb_Module_add_targets,basic,\ AllLangResTarget_sb \ diff --git a/config_host.mk.in b/config_host.mk.in index ff976a7..535b25b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -79,6 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@ export DISABLE_ATL=@DISABLE_ATL@ export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@ +export DISABLE_INTERPRETERS=@DISABLE_INTERPRETERS@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ export DISABLE_PYTHON=@DISABLE_PYTHON@ diff --git a/configure.in b/configure.in index 3b27ac8..cc251d2 100644 --- a/configure.in +++ b/configure.in @@ -384,7 +384,12 @@ AC_ARG_ENABLE(ext-barcode, AC_ARG_ENABLE(database-connectivity, AS_HELP_STRING([--disable-database-connectivity], -[Disable various database connectivity. Work in progress, don't use.]) +[Disable various database connectivity. Work in progress, use only if you are hacking on it.]) +) + +AC_ARG_ENABLE(interpreters, +AS_HELP_STRING([--disable-interpreters], +[Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) ) AC_ARG_ENABLE(ext-diagram, @@ -2031,6 +2036,22 @@ else fi AC_SUBST(DISABLE_DBCONNECTIVITY) +if test -z $enable_interpreters; then +# Disable interpreters for iOS unless specifically overridden +# with --enable-interpreters. +if test $_os != iOS; then +enable_interpreters=yes +fi +fi + +DISABLE_INTERPRETERS='' +if test $enable_interpreters = yes; then +BUILD_TYPE=$BUILD_TYPE INTERPRETERS +else +DISABLE_INTERPRETERS='TRUE' +fi +AC_SUBST(DISABLE_INTERPRETERS) + dnl === dnl Extra check for Windows. Cygwin builds need gcc to build dmake dnl although MSVC is used to build other build-time tools and @@ -4508,8 +4529,13 @@ dnl Java support enable dnl === AC_MSG_CHECKING([whether to build with Java support]) if test $with_java != no; then -AC_MSG_RESULT([yes]) -SOLAR_JAVA=TRUE +if test $DISABLE_INTERPRETERS =
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 190ff38183b8d763234d32ae712a2298021a1a73 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 27 10:13:25 2012 +0200 Just call it Windows here, too diff --git a/configure.in b/configure.in index 5cbd236..a7da32b 100644 --- a/configure.in +++ b/configure.in @@ -6366,7 +6366,7 @@ if test x$enable_postgresql_sdbc != xno; then ;; WINNT) if test $with_krb5 = yes -o $with_gssapi = yes; then -AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) +AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.]) fi ;; Linux|GNU|*BSD|DragonFly) commit 675cfeee6f66e265c696d539974a87e479b7b769 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 27 10:12:34 2012 +0200 Fix shell / test OR operator confusion diff --git a/configure.in b/configure.in index cc251d2..5cbd236 100644 --- a/configure.in +++ b/configure.in @@ -6365,7 +6365,7 @@ if test x$enable_postgresql_sdbc != xno; then fi ;; WINNT) -if test $with_krb5 = yes || $with_gssapi = yes; then +if test $with_krb5 = yes -o $with_gssapi = yes; then AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) fi ;; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit c35e81202cc709f3061e8b189af94e6858418940 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 10:28:39 2012 +0200 Wonder what integration means diff --git a/configure.in b/configure.in index aef0562..d7681d6 100644 --- a/configure.in +++ b/configure.in @@ -371,6 +371,12 @@ AC_SUBST(FONTCONFIG_TARBALL) # If there is extra dependency over configure options then the enable should # be automagic based on wether the requiring feature is enabled or not. # All this options change anything only with --enable-extension-integration. + +# The name of this option and its help string makes it sound as if +# extensions are built anyway, just not integrated in the installer, +# if you use --disable-extension-integration. Is that really the +# case? + AC_ARG_ENABLE(extension-integration, AS_HELP_STRING([--disable-extension-integration], [Disable integration of the built extensions in the installer of the commit e28c5b15d72f1982636e8853cbd7e8838bc93a04 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 10:24:33 2012 +0200 s/builded/built diff --git a/configure.in b/configure.in index a7da32b..aef0562 100644 --- a/configure.in +++ b/configure.in @@ -373,7 +373,7 @@ AC_SUBST(FONTCONFIG_TARBALL) # All this options change anything only with --enable-extension-integration. AC_ARG_ENABLE(extension-integration, AS_HELP_STRING([--disable-extension-integration], -[Disable integration of the builded extensions to the installer of the +[Disable integration of the built extensions in the installer of the product. Use this switch to disable the integration.]) ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_forms/source/resource/forms_frm_resource.cxx |4 --
binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx |2 -
binfilter/bf_svtools/source/misc/tl_strcvt.cxx |4 --
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx|1
binfilter/inc/bf_svtools/xbmread.hxx|1
binfilter/inc/bf_tools/string.hxx | 23
6 files changed, 4 insertions(+), 31 deletions(-)
New commits:
commit b2f6ea583ae50e20ee1b891a742fc920eec4e5e2
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 25 23:23:10 2012 +
mirror in non-binfilter changes
diff --git a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
index 1f8846f..72c8cb4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
@@ -49,7 +49,7 @@ XBMReader::XBMReader( SvStream rStm ) :
bStatus ( TRUE )
{
pHexTable = new short[ 256 ];
-maUpperName = String::CreateFromAscii( SVIXBM, 6 );
+maUpperName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVIXBM));
InitTable();
}
diff --git a/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
b/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
index 1d52794..6368e32 100644
--- a/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
@@ -29,8 +29,6 @@
namespace binfilter
{
-// ===
-
ByteString::ByteString( const rtl::OString rStr )
: mpData(NULL)
{
@@ -50,8 +48,6 @@ ByteString::ByteString( const rtl::OString rStr )
}
}
-// ---
-
ByteString ByteString::Assign( const rtl::OString rStr )
{
DBG_CHKTHIS( ByteString, DbgCheckByteString );
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index 92b8158..0d12b29 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -276,6 +276,7 @@ struct OUStringLess
/*?*/ aIter-second = 0;
/*?*/ }
/*N*/ }
+/*N*/ delete mpStreamMap;
/*N*/ }
/*N*/ }
diff --git a/binfilter/inc/bf_svtools/xbmread.hxx
b/binfilter/inc/bf_svtools/xbmread.hxx
index 6b281fa..8fdecb7 100644
--- a/binfilter/inc/bf_svtools/xbmread.hxx
+++ b/binfilter/inc/bf_svtools/xbmread.hxx
@@ -30,6 +30,7 @@
#define _XBMREAD_HXX
#include bf_svtools/bf_solar.h
+#include bf_tools/string.hxx
#include vcl/graph.hxx
#include vcl/bmpacc.hxx
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 6036737..a43f04f 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -153,21 +153,10 @@ public:
return rtl::OString (reinterpret_castrtl_String*(mpData));
}
-operator ::ByteString () const
-{
-return *(reinterpret_cast const ::ByteString* (this));
-}
-
ByteString Assign( const ByteString rStr );
ByteString Assign( const rtl::OString rStr );
ByteString Assign( const sal_Char* pCharStr );
-ByteString Assign( const ::ByteString rStr )
-{
-return Assign(rStr.GetBuffer(), rStr.Len());
-}
ByteString Assign( sal_Char c );
-ByteString operator =( const ::ByteString rStr )
-{ return Assign( rStr ); }
ByteString operator =( const ByteString rStr )
{ return Assign( rStr ); }
ByteString operator =( const rtl::OString rStr )
@@ -180,13 +169,7 @@ public:
ByteString Append( const ByteString rStr );
ByteString Append( const sal_Char* pCharStr );
ByteString Append( const sal_Char* pCharStr, xub_StrLen nLen );
-ByteString Append( const ::ByteString rStr )
-{
-return Append(rStr.GetBuffer(), rStr.Len());
-}
ByteString Append( char c );
-ByteString operator +=( const ::ByteString rStr )
-{ return Append( rStr ); }
ByteString operator +=( const ByteString rStr )
{ return Append( rStr ); }
ByteString operator +=( const sal_Char* pCharStr )
@@ -232,10 +215,6 @@ public:
xub_StrLen nIndex, xub_StrLen nLen ) const;
sal_BoolEquals( const sal_Char* pCharStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
-sal_BoolEquals( const ::ByteString rStr ) const
-{
-return Equals(rStr.GetBuffer(), 0, rStr.Len());
-}
xub_StrLen Match( const ByteString rStr ) const;
@@ -260,8 +239,6 @@ public:
const sal_Char*
[Libreoffice-commits] .: cui/source
cui/source/tabpages/autocdlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8e750a2d9c653e0693738c847fe2ee2a8ab04052
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri Feb 24 16:42:35 2012 +0100
Reduced loadtime of autocorrect tables
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 93a370f..cdd56d0 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1213,7 +1213,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxAutocorrWordList* pWordList =
pAutoCorrect-LoadAutocorrWordList(eLang);
-
+aReplaceTLB.SetUpdateMode(sal_False);
for(sal_uInt16 i = 0; i pWordList-Count(); i++)
{
SvxAutocorrWordPtr pWordPtr = pWordList-GetObject(i);
@@ -1234,7 +1234,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
}
aNewReplacePB.Enable(sal_False);
aDeleteReplacePB.Enable(sal_False);
-
+aReplaceTLB.SetUpdateMode(sal_True);
}
SfxViewShell* pViewShell = SfxViewShell::Current();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/fdo45187.rtf | 32
sw/qa/extras/rtftok/rtftok.cxx| 22 ++
2 files changed, 54 insertions(+)
New commits:
commit bb4ceaa4bbe253f4d6b22b09098de0f2f0b793c8
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 27 11:19:38 2012 +0100
add testcase for fdo#45187
diff --git a/sw/qa/extras/rtftok/data/fdo45187.rtf
b/sw/qa/extras/rtftok/data/fdo45187.rtf
new file mode 100644
index 000..61b71ad
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo45187.rtf
@@ -0,0 +1,32 @@
+{\rtf1
+{\field
+{\*\fldinst SHAPE }
+{\fldrslt
+{\shp
+{\*\shpinst\shpleft1000\shptop1000\shpright2000\shpbottom2000
+{\sp
+{\sn shapeType}
+{\sv 1}
+}
+}
+}
+}
+}
+first
+\par
+{\field
+{\*\fldinst SHAPE }
+{\fldrslt
+{\shp
+{\*\shpinst\shpleft1000\shptop3000\shpright2000\shpbottom4000
+{\sp
+{\sn shapeType}
+{\sv 3}
+}
+}
+}
+}
+}
+second
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 92c3229..0e4a31b 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -59,6 +59,7 @@ public:
void testFdo45543();
void testN695479();
void testFdo42465();
+void testFdo45187();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -67,6 +68,7 @@ public:
CPPUNIT_TEST(testFdo45543);
CPPUNIT_TEST(testN695479);
CPPUNIT_TEST(testFdo42465);
+CPPUNIT_TEST(testFdo45187);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -244,6 +246,26 @@ void RtfModelTest::testFdo42465()
CPPUNIT_ASSERT_EQUAL(3, getLength());
}
+void RtfModelTest::testFdo45187()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo45187.rtf)));
+
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+// There should be two shapes.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws-getCount());
+// They should be anchored to different paragraphs.
+uno::Referencebeans::XPropertySet xPropertySet(xDraws-getByIndex(0),
uno::UNO_QUERY);
+uno::Any aValue =
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AnchorPosition)));
+awt::Point aFirstPoint;
+aValue = aFirstPoint;
+xPropertySet.set(xDraws-getByIndex(1), uno::UNO_QUERY);
+aValue =
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AnchorPosition)));
+awt::Point aSecondPoint;
+aValue = aSecondPoint;
+CPPUNIT_ASSERT(aFirstPoint.Y != aSecondPoint.Y);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/inc/retrievedinputstreamdata.hxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 0fcf3e67623814b269e68f6cf5c6648f7cfdb5a6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 27 10:50:16 2012 +
fix MacOSX tinderbox build
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx
b/sw/source/core/inc/retrievedinputstreamdata.hxx
index a7bef2f..49797ed 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -77,10 +77,6 @@ class SwRetrievedInputStreamDataManager
static SwRetrievedInputStreamDataManager GetManager();
-~SwRetrievedInputStreamDataManager()
-{
-};
-
tDataKey ReserveData( boost::weak_ptr
SwAsyncRetrieveInputStreamThreadConsumer pThreadConsumer );
void PushData( const tDataKey nDataKey,
@@ -99,12 +95,6 @@ class SwRetrievedInputStreamDataManager
osl::Mutex maMutex;
std::map tDataKey, tData maInputStreamData;
-
-templatetypename T, typename Unique friend class rtl::Static;
-
-SwRetrievedInputStreamDataManager()
-{
-};
};
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/tabpages/autocdlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3a90b7fea7de8860dfdb92925df39dac3d0ed4fc
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri Feb 24 16:42:35 2012 +0100
Reduced loadtime of autocorrect tables
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 147a18f..764203a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1225,7 +1225,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxAutocorrWordList* pWordList =
pAutoCorrect-LoadAutocorrWordList(eLang);
-
+aReplaceTLB.SetUpdateMode(sal_False);
for(sal_uInt16 i = 0; i pWordList-Count(); i++)
{
SvxAutocorrWordPtr pWordPtr = pWordList-GetObject(i);
@@ -1248,7 +1248,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
}
aNewReplacePB.Enable(sal_False);
aDeleteReplacePB.Enable(sal_False);
-
+aReplaceTLB.SetUpdateMode(sal_True);
}
SfxViewShell* pViewShell = SfxViewShell::Current();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/webdav/NeonLockStore.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c58882fda80b63baac3360001b0fdf251d96e0eb Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 27 11:03:02 2012 + fix msvc2005 build diff --git a/ucb/source/ucp/webdav/NeonLockStore.cxx b/ucb/source/ucp/webdav/NeonLockStore.cxx index 3c84ad3..77e6258 100644 --- a/ucb/source/ucp/webdav/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav/NeonLockStore.cxx @@ -80,7 +80,7 @@ void TickerThread::execute() TimeValue aTV; aTV.Seconds = 0; aTV.Nanosec = 10 / nNth; -osl::Thread::wait( aTV ); +salhelper::Thread::wait( aTV ); } OSL_TRACE( TickerThread: stop. ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx |2 ++
svx/source/svdraw/svdoashp.cxx|2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 44b98b588c51c976c38b08844f7e09d236518e32
Author: Muthu Subramanian sumu...@suse.com
Date: Mon Feb 27 18:03:21 2012 +0530
n742593: Adding checks before using textbox sizes.
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 3e5f340..3087526 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1193,6 +1193,8 @@ Rectangle EnhancedCustomShape2d::GetTextRect() const
}
Rectangle aRect( aTopLeft, aBottomRight );
OSL_TRACE(EnhancedCustomShape2d::GetTextRect: %d x %d, aRect.GetWidth(),
aRect.GetHeight());
+if( aRect.GetWidth() = 1 || aRect.GetHeight() = 1 )
+return aLogicRect;
aRect.Move( aLogicRect.Left(), aLogicRect.Top() );
aRect.Justify();
return aRect;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index aac2cf8..2cd4a04 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -556,7 +556,7 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle
rTextBound ) const
if ( xCustomShapeEngine.is() )
{
awt::Rectangle aR( xCustomShapeEngine-getTextBounds() );
-if ( aR.Width || aR.Height )
+if ( aR.Width 1 aR.Height 1 )
{
rTextBound = Rectangle( Point( aR.X, aR.Y ), Size( aR.Width,
aR.Height ) );
bRet = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 15
++
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit ee0cb9d05d11c23421ec5d7b268eb8c5e049
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Feb 27 13:10:40 2012 +0100
fdo#46675: expand group memberships in get*Privileges
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 3748098..d925cb1 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2071,7 +2071,8 @@ void DatabaseMetaData::init_getPrivs_stmt ()
{
rtl::OUStringBuffer sSQL(300);
sSQL.append( ASCII_STR(
- SELECT * FROM (
+ SELECT dp.TABLE_CAT, dp.TABLE_SCHEM, dp.TABLE_NAME, dp.GRANTOR,
pr.rolname AS GRANTEE, dp.privilege, dp.is_grantable
+ FROM (
SELECT table_catalog AS TABLE_CAT, table_schema AS TABLE_SCHEM,
table_name,
grantor, grantee, privilege_type AS PRIVILEGE,
is_grantable
FROM information_schema.table_privileges) );
@@ -2093,14 +2094,15 @@ void DatabaseMetaData::init_getPrivs_stmt ()
WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND
pg_has_role(rg.oid, c.relowner, 'USAGE')
AND c.relowner=ro.oid AND c.relnamespace = pn.oid) );
sSQL.append( ASCII_STR(
- ) s
- WHERE table_schem LIKE ? AND table_name LIKE ?
+ ) dp,
+ (SELECT oid, rolname FROM pg_catalog.pg_roles UNION ALL VALUES
(0, 'PUBLIC')) pr
+ WHERE table_schem LIKE ? AND table_name LIKE ? AND
pg_has_role(pr.oid, dp.grantee, 'USAGE')
ORDER BY table_schem, table_name, privilege ) );
m_getTablePrivs_stmt = m_origin-prepareStatement(
sSQL.makeStringAndClear() );
sSQL.append( ASCII_STR(
- SELECT * FROM (
+ SELECT dp.TABLE_CAT, dp.TABLE_SCHEM, dp.TABLE_NAME,
dp.COLUMN_NAME, dp.GRANTOR, pr.rolname AS GRANTEE, dp.PRIVILEGE,
dp.IS_GRANTABLE FROM (
SELECT table_catalog AS TABLE_CAT, table_schema AS TABLE_SCHEM,
table_name, column_name,
grantor, grantee, privilege_type AS PRIVILEGE,
is_grantable
FROM information_schema.column_privileges) );
@@ -2122,8 +2124,9 @@ void DatabaseMetaData::init_getPrivs_stmt ()
WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND
pg_has_role(rg.oid, c.relowner, 'USAGE')
AND c.relowner=ro.oid AND c.relnamespace = pn.oid AND
a.attrelid = c.oid AND a.attnum 0) );
sSQL.append( ASCII_STR(
- ) s
- WHERE table_schem = ? AND table_name = ? AND column_name LIKE ?
+ ) dp,
+ (SELECT oid, rolname FROM pg_catalog.pg_roles UNION ALL VALUES
(0, 'PUBLIC')) pr
+ WHERE table_schem = ? AND table_name = ? AND column_name LIKE ?
AND pg_has_role(pr.oid, dp.grantee, 'USAGE')
ORDER BY column_name, privilege ) );
m_getColumnPrivs_stmt = m_origin-prepareStatement(
sSQL.makeStringAndClear() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx |2 -
sw/source/core/doc/docfmt.cxx| 48 ---
sw/source/ui/dochdl/swdtflvr.cxx |2 -
3 files changed, 32 insertions(+), 20 deletions(-)
New commits:
commit 15547450bdba10959473c2cb5891f29ad5053b09
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 27 12:39:06 2012 +
Resolves: fdo#46038 don't copy page styles into temporary clipboard doc
writer rtf export has a nasty pgdsctbl extension
sd rtf import has nasty if its got a table keyword in it its a table
logic
Classically we never put our styles into the temporary clipboard, so fastest
and safest fix is to simply skip putting the page styles into it.
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 580108e..cfe9935 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1286,7 +1286,7 @@ public:
SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl rColl );
// Replace all styles with those from rSource.
-void ReplaceStyles( const SwDoc rSource );
+void ReplaceStyles( const SwDoc rSource, bool bIncludePageStyles = true );
// Replace all property defaults with those from rSource.
void ReplaceDefaults( const SwDoc rSource );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 05227ea..01176c9 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2134,7 +2134,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc,
SwPageDesc rDstDesc,
}
}
-void SwDoc::ReplaceStyles( const SwDoc rSource )
+void SwDoc::ReplaceStyles( const SwDoc rSource, bool bIncludePageStyles )
{
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -2145,26 +2145,38 @@ void SwDoc::ReplaceStyles( const SwDoc rSource )
CopyFmtArr( *rSource.pTxtFmtCollTbl, *pTxtFmtCollTbl,
SwDoc::_MakeTxtFmtColl, *pDfltTxtFmtColl );
-// and now the page templates
-sal_uInt16 nCnt = rSource.aPageDescs.Count();
-if( nCnt )
-{
-// a different Doc - Number formatter needs to be merged
-SwTblNumFmtMerge aTNFM( rSource, *this );
+sal_uInt16 nCnt;
-// 1st step: Create all formats (skip the 0th - it's the default!)
-while( nCnt )
+//To-Do:
+// a) in rtf export don't export our hideous pgdsctbl
+// extension to rtf anymore
+// b) in sd rtf import (View::InsertData) don't use
+// a super-fragile test for mere presence of \trowd to
+// indicate import of rtf into a table
+// c) then drop use of bIncludePageStyles
+if (bIncludePageStyles)
+{
+// and now the page templates
+nCnt = rSource.aPageDescs.Count();
+if( nCnt )
{
-SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
-if( 0 == ::lcl_FindPageDesc( aPageDescs, pSrc-GetName() ) )
-MakePageDesc( pSrc-GetName() );
-}
+// a different Doc - Number formatter needs to be merged
+SwTblNumFmtMerge aTNFM( rSource, *this );
-// 2nd step: Copy all attributes, set the right parents
-for( nCnt = rSource.aPageDescs.Count(); nCnt; )
-{
-SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
-CopyPageDesc( *pSrc, *::lcl_FindPageDesc( aPageDescs,
pSrc-GetName() ));
+// 1st step: Create all formats (skip the 0th - it's the default!)
+while( nCnt )
+{
+SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
+if( 0 == ::lcl_FindPageDesc( aPageDescs, pSrc-GetName() ) )
+MakePageDesc( pSrc-GetName() );
+}
+
+// 2nd step: Copy all attributes, set the right parents
+for( nCnt = rSource.aPageDescs.Count(); nCnt; )
+{
+SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
+CopyPageDesc( *pSrc, *::lcl_FindPageDesc( aPageDescs,
pSrc-GetName() ));
+}
}
}
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b7be519..adfa4d1 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -379,7 +379,7 @@ namespace
//It would probably make most sense here to only insert the styles used
//by the selection, e.g. apply SwDoc::IsUsed on styles ?
-rDest.ReplaceStyles(rSrc);
+rDest.ReplaceStyles(rSrc, false);
rSrcWrtShell.Copy(rDest);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw binfilter/inc
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx|2 +-
binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx|2 +-
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx |1 -
binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx |2 +-
binfilter/inc/bf_svx/numitem.hxx|4 +---
5 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d09cf17a6c791228370f3f534ba058325cc0c4f5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 27 12:43:23 2012 +
some windows warnings
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 99a8ef6..d59dd4d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -2443,7 +2443,7 @@ void ScInterpreter::ScRGP()
return;
}
BYTE nCase; // 1 = normal, 2,3 = mehrfach
-USHORT nCX, nRX, nCY, nRY, M, N;
+USHORT nCX, nRX, nCY, nRY, M(0), N(0);
pMatY-GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
for ( ULONG i = 0; i nCountY; i++ )
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index a0c8573..531a923 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
/*N*/ {
/*N*/ BOOL bResult=FALSE;
/*N*/ ScRangeUtil aRangeUtil;
-/*N*/ USHORT nTab, nColStart, nColEnd, nRowStart, nRowEnd;
+/*N*/ USHORT nTab(0), nColStart(0), nColEnd(0), nRowStart(0),
nRowEnd(0);
/*N*/
/*N*/ if( eScope==RUTL_NAMES )
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
index 17972e6..1730d6b 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
@@ -320,7 +320,6 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( )
throw(::com::sun::star::uno
return xNameAccess-getByName( aNames.getConstArray()[nIndex] );
throw lang::IndexOutOfBoundsException();
-return uno::Any();
}
// XElementAccess
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
index 8ebf9e9..66a62fb 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
@@ -170,7 +170,7 @@ void SwExcelParser::Label25()
// -- 0x06
void SwExcelParser::Formula25()
{
-UINT16 nRow, nCol, nXF, nFormLen;
+UINT16 nRow, nCol, nXF(0), nFormLen;
double fCurVal;
BYTE nAttr0, nFlag0;
diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx
index 2159420..f21c0a5 100644
--- a/binfilter/inc/bf_svx/numitem.hxx
+++ b/binfilter/inc/bf_svx/numitem.hxx
@@ -140,13 +140,11 @@ class SvxNumberFormat : public SvxNumberType
BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize,
only cached for WINDOW/VDEV
-// void GetCharStr( ULONG nNo, String rStr ) const;
-// void GetCharStrN( ULONG nNo, String rStr ) const;
public:
SvxNumberFormat(sal_Int16 nNumberingType);
SvxNumberFormat(const SvxNumberFormat rFormat);
SvxNumberFormat(SvStream rStream);
-~SvxNumberFormat();
+virtual ~SvxNumberFormat();
SvStream Store(SvStream rStream, FontToSubsFontConverter) { return
rStream; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua vcl/source
vcl/aqua/source/app/salinst.cxx |6 +++---
vcl/aqua/source/app/salsys.cxx |4 ++--
vcl/aqua/source/dtrans/HtmlFmtFlt.cxx |4 ++--
vcl/aqua/source/dtrans/PictToBmpFlt.cxx |4 ++--
vcl/source/gdi/pdfwriter_impl.cxx |5 ++---
vcl/source/gdi/print3.cxx |2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 5d1acca5a9d40d6197e12fd959c3644bcc60f799
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Mon Feb 27 18:49:17 2012 +0530
Replace getLength() with isEmpty() where appropriate
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 7a01b0b..794dd84 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -997,7 +997,7 @@ rtl::OUString AquaSalInstance::GetDefaultPrinter()
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
-if( ! maDefaultPrinter.getLength() )
+if( maDefaultPrinter.isEmpty() )
{
NSPrintInfo* pPI = [NSPrintInfo sharedPrintInfo];
DBG_ASSERT( pPI, no print info );
@@ -1138,10 +1138,10 @@ void AquaSalInstance::AddToRecentDocumentList(const
rtl::OUString rFileUrl, con
{
// Convert file URL for external use (see above)
rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
-if( 0 == externalUrl.getLength() )
+if( externalUrl.isEmpty() )
externalUrl = rFileUrl;
-if( externalUrl.getLength() !isDangerousUrl( externalUrl ) )
+if( !externalUrl.isEmpty() !isDangerousUrl( externalUrl ) )
{
NSString* pString = CreateNSString( externalUrl );
NSURL* pURL = [NSURL URLWithString: pString];
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 8a371d6..7c6f683 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -109,7 +109,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned
int nScreen )
static NSString* getStandardString( int nButtonId )
{
rtl::OUString aText( Button::GetStandardText( nButtonId ) );
-if( ! aText.getLength() ) // this is for bad cases, we might be missing
the vcl resource
+if( aText.isEmpty() ) // this is for bad cases, we might be missing the
vcl resource
{
switch( nButtonId )
{
@@ -121,7 +121,7 @@ static NSString* getStandardString( int nButtonId )
case BUTTON_NO :aText = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( No ) );break;
}
}
-return aText.getLength() ? CreateNSString( aText) : nil;
+return aText.isEmpty() ? nil : CreateNSString( aText);
}
int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString rTitle,
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 0bd461d..275f5a1 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -65,9 +65,9 @@ const std::string TAG_END_BODY = std::string(/BODY);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
-OSL_ASSERT(aTextHtml.getLength() 0);
+OSL_ASSERT(!aTextHtml.isEmpty());
-if (!(aTextHtml.getLength() 0))
+if (aTextHtml.isEmpty())
return Sequencesal_Int8();
// fill the buffer with dummy values to calc the exact length
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 3eb4fb8..4b3d371 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -161,7 +161,7 @@ bool ImageToBMP( com::sun::star::uno::Sequencesal_Int8
aPict,
{
aBmp.realloc( [pOut length] );
[pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-bResult = (aBmp.getLength() != 0);
+bResult = (!aBmp.isEmpty());
}
}
}
@@ -190,7 +190,7 @@ bool BMPToImage( com::sun::star::uno::Sequencesal_Int8
aBmp,
{
aPict.realloc( [pOut length] );
[pOut getBytes: aPict.getArray() length: aPict.getLength()];
-bResult = (aPict.getLength() != 0);
+bResult = (!aPict.isEmpty());
}
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 8456d86..3820d81 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6698,11 +6698,10 @@ PDFStreamIf::~PDFStreamIf()
void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence
sal_Int8 aData ) throw()
{
-if( m_bWrite )
+if( m_bWrite aData.getLength() )
{
sal_Int32 nBytes = aData.getLength();
-if( nBytes 0 )
-m_pWriter-writeBuffer( aData.getConstArray(), nBytes );
+m_pWriter-writeBuffer( aData.getConstArray(), nBytes );
}
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xestring.cxx | 17 -
sc/source/filter/excel/xestyle.cxx |6 --
sc/source/filter/excel/xlformula.cxx | 11 ---
sc/source/filter/excel/xlstyle.cxx |5 -
sc/source/filter/inc/xestring.hxx|2 --
sc/source/filter/inc/xestyle.hxx |6 --
sc/source/filter/inc/xlformula.hxx |3 ---
sc/source/filter/inc/xlstyle.hxx |2 --
8 files changed, 52 deletions(-)
New commits:
commit 361b7fc217c69e7a5b457f86f721ad00f2c8c7d0
Author: Petr Vorel petr.vo...@gmail.com
Date: Mon Feb 27 18:56:04 2012 +0530
Removed unused code.
diff --git a/sc/source/filter/excel/xestring.cxx
b/sc/source/filter/excel/xestring.cxx
index d12ebe8..2053a68 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -184,23 +184,6 @@ void XclExpString::AppendByte( sal_Unicode cChar,
rtl_TextEncoding eTextEnc )
// formatting runs
-void XclExpString::SetFormats( const XclFormatRunVec rFormats )
-{
-maFormats = rFormats;
-#if OSL_DEBUG_LEVEL 0
-if( IsRich() )
-{
-XclFormatRunVec::const_iterator aCurr = maFormats.begin();
-XclFormatRunVec::const_iterator aPrev = aCurr;
-XclFormatRunVec::const_iterator aEnd = maFormats.end();
-for( ++aCurr; aCurr != aEnd; ++aCurr, ++aPrev )
-OSL_ENSURE( aPrev-mnChar aCurr-mnChar,
XclExpString::SetFormats - invalid char order );
-OSL_ENSURE( aPrev-mnChar = mnLen, XclExpString::SetFormats -
invalid char index );
-}
-#endif
-LimitFormatCount( mbIsBiff8 ? EXC_STR_MAXLEN : EXC_STR_MAXLEN_8BIT );
-}
-
void XclExpString::AppendFormat( sal_uInt16 nChar, sal_uInt16 nFontIdx, bool
bDropDuplicate )
{
OSL_ENSURE( maFormats.empty() || (maFormats.back().mnChar nChar),
XclExpString::AppendFormat - invalid char index );
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 1d7f190..ae51486 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1124,12 +1124,6 @@ sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet
rItemSet,
return Insert( aFont, eColorType, bAppFont );
}
-sal_uInt16 XclExpFontBuffer::Insert( const ScPatternAttr rPattern,
-sal_Int16 nScript, XclExpColorType eColorType, bool bAppFont )
-{
-return Insert( rPattern.GetItemSet(), nScript, eColorType, bAppFont );
-}
-
void XclExpFontBuffer::Save( XclExpStream rStrm )
{
maFontList.Save( rStrm );
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 02154ba..8685041 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -483,12 +483,6 @@ XclTokenArray::XclTokenArray( bool bVolatile ) :
{
}
-XclTokenArray::XclTokenArray( ScfUInt8Vec rTokVec, bool bVolatile ) :
-mbVolatile( bVolatile )
-{
-maTokVec.swap( rTokVec );
-}
-
XclTokenArray::XclTokenArray( ScfUInt8Vec rTokVec, ScfUInt8Vec rExtDataVec,
bool bVolatile ) :
mbVolatile( bVolatile )
{
@@ -598,11 +592,6 @@ XclTokenArrayIterator::XclTokenArrayIterator( const
XclTokenArrayIterator rTokA
SkipSpaces();
}
-void XclTokenArrayIterator::Init()
-{
-mppScTokenBeg = mppScTokenEnd = mppScToken = 0;
-}
-
void XclTokenArrayIterator::Init( const ScTokenArray rScTokArr, bool
bSkipSpaces )
{
sal_uInt16 nTokArrLen = rScTokArr.GetLen();
diff --git a/sc/source/filter/excel/xlstyle.cxx
b/sc/source/filter/excel/xlstyle.cxx
index db0603d..e8ef58e 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -1751,11 +1751,6 @@ void XclXFBase::SetAllUsedFlags( bool bUsed )
mbProtUsed = mbFontUsed = mbFmtUsed = mbAlignUsed = mbBorderUsed =
mbAreaUsed = bUsed;
}
-bool XclXFBase::HasUsedFlags() const
-{
-return mbProtUsed || mbFontUsed || mbFmtUsed || mbAlignUsed ||
mbBorderUsed || mbAreaUsed;
-}
-
bool XclXFBase::Equals( const XclXFBase rCmp ) const
{
return
diff --git a/sc/source/filter/inc/xestring.hxx
b/sc/source/filter/inc/xestring.hxx
index abc6f33..42ab5db 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -131,8 +131,6 @@ public:
// formatting runs
-/** Sets new formatting runs for the current text. */
-voidSetFormats( const XclFormatRunVec rFormats );
/** Appends a formatting run. nChar must be greater than last contained
character index. */
voidAppendFormat( sal_uInt16 nChar, sal_uInt16 nFontIdx,
bool bDropDuplicate = true );
/** Appends a trailing formatting run with the passed font index. */
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 8f38b6f..c1263b3 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -247,12 +247,6 @@ public:
[Libreoffice-commits] .: 2 commits - fpicker/Executable_kdefilepicker.mk fpicker/Library_fps_kde4.mk fpicker/Library_fps_kde.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/unx
fpicker/Executable_kdefilepicker.mk |5 +++ fpicker/Library_fps_kde.mk |7 fpicker/Library_fps_kde4.mk |5 +++ vcl/Library_vclplug_kde.mk |7 vcl/Library_vclplug_kde4.mk |6 +++ vcl/unx/kde4/KDEXLib.hxx|2 - vcl/unx/kde4/warning_guard_qhash.h | 58 7 files changed, 31 insertions(+), 59 deletions(-) New commits: commit a667f08798297b9fa5f78a327250f24cb8b1638c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Feb 27 14:10:59 2012 +0100 disable warnigns as errors for KDE3 code Too old codebase, there simply have to be warnings. diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk index f442f86..d833763 100644 --- a/fpicker/Library_fps_kde.mk +++ b/fpicker/Library_fps_kde.mk @@ -53,4 +53,6 @@ $(eval $(call gb_Library_add_cxxflags,fps_kde,\ -Wno-shadow \ )) +$(eval $(call gb_LIbrary_set_warnings_not_errors,fps_kde)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 139479f..3f9e66a 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde,\ -Wno-shadow \ )) +$(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ commit 9974eed353263cf10b966000f99f8e69233382a9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Feb 24 17:27:21 2012 +0100 disable -Wshadow for KDE backends KDE/Qt consider -Wshadow not worth the trouble, and the qhash workaround shows why. diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk index 9f8cca2..a5c95fb 100644 --- a/fpicker/Executable_kdefilepicker.mk +++ b/fpicker/Executable_kdefilepicker.mk @@ -58,4 +58,9 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\ $(eval $(call gb_Executable_set_warnings_not_errors,kdefilepicker)) +# KDE/Qt consider -Wshadow more trouble than benefit +$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\ + -Wno-shadow \ +)) + # vim: set noet sw=4 ts=4: diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk index 5624fd6..f442f86 100644 --- a/fpicker/Library_fps_kde.mk +++ b/fpicker/Library_fps_kde.mk @@ -48,4 +48,9 @@ $(eval $(call gb_Library_add_exception_objects,fps_kde,\ fpicker/source/unx/kde_unx/UnxNotifyThread \ )) +# KDE/Qt consider -Wshadow more trouble than benefit +$(eval $(call gb_Library_add_cxxflags,fps_kde,\ + -Wno-shadow \ +)) + # vim: set noet sw=4 ts=4: diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk index 10a06c7..d806737 100644 --- a/fpicker/Library_fps_kde4.mk +++ b/fpicker/Library_fps_kde4.mk @@ -65,4 +65,9 @@ $(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\ CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \ )) +# KDE/Qt consider -Wshadow more trouble than benefit +$(eval $(call gb_Library_add_cxxflags,fps_kde4,\ +-Wno-shadow \ +)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index d1c6f6d..139479f 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -85,6 +85,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/salnativewidgets-kde \ )) +# KDE/Qt consider -Wshadow more trouble than benefit +$(eval $(call gb_Library_add_cxxflags,vclplug_kde,\ +-Wno-shadow \ +)) + + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ dl \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 34d2892..e26e054 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -94,6 +94,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/VCLKDEApplication \ )) +# KDE/Qt consider -Wshadow more trouble than benefit +$(eval $(call gb_Library_add_cxxflags,fps_kde4,\ +-Wno-shadow \ +)) + + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ dl \ diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index 9297be5..497a97f 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -32,7 +32,7 @@ #include fixx11h.h -#include warning_guard_qhash.h +#include qhash.h #include qsocketnotifier.h #include qtimer.h diff --git a/vcl/unx/kde4/warning_guard_qhash.h b/vcl/unx/kde4/warning_guard_qhash.h deleted file mode 100644 index a6a520c..000 --- a/vcl/unx/kde4/warning_guard_qhash.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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
[Libreoffice-commits] .: vcl/aqua vcl/source
vcl/aqua/source/dtrans/HtmlFmtFlt.cxx |4 ++--
vcl/aqua/source/dtrans/PictToBmpFlt.cxx |4 ++--
vcl/source/gdi/print3.cxx |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c581d33dec47a4c411a034482876543f6357d1e8
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 27 17:12:33 2012 +0400
there is no Sequence::isEmpty()
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 275f5a1..0bd461d 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -65,9 +65,9 @@ const std::string TAG_END_BODY = std::string(/BODY);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
-OSL_ASSERT(!aTextHtml.isEmpty());
+OSL_ASSERT(aTextHtml.getLength() 0);
-if (aTextHtml.isEmpty())
+if (!(aTextHtml.getLength() 0))
return Sequencesal_Int8();
// fill the buffer with dummy values to calc the exact length
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 4b3d371..3eb4fb8 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -161,7 +161,7 @@ bool ImageToBMP( com::sun::star::uno::Sequencesal_Int8
aPict,
{
aBmp.realloc( [pOut length] );
[pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-bResult = (!aBmp.isEmpty());
+bResult = (aBmp.getLength() != 0);
}
}
}
@@ -190,7 +190,7 @@ bool BMPToImage( com::sun::star::uno::Sequencesal_Int8
aBmp,
{
aPict.realloc( [pOut length] );
[pOut getBytes: aPict.getArray() length: aPict.getLength()];
-bResult = (!aPict.isEmpty());
+bResult = (aPict.getLength() != 0);
}
}
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index abdece6..482491d 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1336,7 +1336,7 @@ void PrinterController::setValue( const
beans::PropertyValue i_rValue )
void PrinterController::setUIOptions( const Sequence beans::PropertyValue
i_rOptions )
{
-DBG_ASSERT( mpImplData-maUIOptions.isEmpty(), setUIOptions called twice
! );
+DBG_ASSERT( mpImplData-maUIOptions.getLength() == 0, setUIOptions called
twice ! );
mpImplData-maUIOptions = i_rOptions;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6c0f9cc00e81862e888b680a83bd14c0f16811aa
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 27 16:26:39 2012 +0400
fdo#31966: do not create an empty slide when printing handouts
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 758e5ed..64cd478 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1967,8 +1967,8 @@ private:
// Create a printer page when we have found one page for each
// placeholder or when this is the last (and special) loop.
-if (aPageIndices.size() == nShapeCount
-|| nIndex==nCount)
+if (!aPageIndices.empty()
+(aPageIndices.size() == nShapeCount || nIndex == nCount))
{
maPrinterPages.push_back(
::boost::shared_ptrPrinterPage(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/ooo/ure.scp |2 -- 1 file changed, 2 deletions(-) New commits: commit 216e30277b06124822cccdc2a6d46de57a2f8e6e Author: Petr Mladek pmla...@suse.cz Date: Mon Feb 27 12:24:20 2012 +0100 pack libstdc++ and libgcc_s only in the new stdlibs subpackage (fdo#46658) The older commit moved the gid's definition in the file list but it did not move it in the module list. (cherry picked from commit 550cc3e9dbe7a86797fc946f40d9ae5529d6ce2c) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 006e001..8deb571 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -1103,8 +1103,6 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Uuresolver, gid_File_Dl_Libxml2, gid_File_Dl_Stlport, -gid_File_Dl_GccS, -gid_File_Dl_Stdcpp, gid_File_Lib_Mingw_GccS_Ure, gid_File_Lib_Mingw_Stdcpp_Ure, gid_File_Dl_Unicows, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/findfrm.cxx |1 +
sw/source/core/layout/flycnt.cxx |1 +
sw/source/core/layout/paintfrm.cxx |1 +
sw/source/core/layout/wsfrm.cxx|2 ++
4 files changed, 5 insertions(+)
New commits:
commit 0f1120ad344ae220a93bd2af9cf4a6bf50e25888
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Feb 27 15:09:52 2012 +0100
Fix build (few missing {'s in the translations).
diff --git a/sw/source/core/layout/findfrm.cxx
b/sw/source/core/layout/findfrm.cxx
index c4829a3..a2c7bf0 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1365,6 +1365,7 @@ void SwFrm::SetInfFlags()
if( IsFtnContFrm() )
bInfFtn = sal_True;
do
+{
// bInfBody is only set in the page body, but not in the column body
if ( pFrm-IsBodyFrm() !bInfFtn pFrm-GetUpper()
pFrm-GetUpper()-IsPageFrm() )
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 3c2cf9c..0e21be6 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -937,6 +937,7 @@ sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point rPt,
const SwLayoutFrm *pLay
if ( pCnt-Frm().Top() = rPt.Y() )
{
if ( nDiff nDistance )
+{
//This one is the nearer one
nDistance = nNearest = nDiff;
rpCnt = pNearest = pCnt;
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b9b903a..271ee0b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6189,6 +6189,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
aP2( rP2 );
while ( aP1.*pDirPt aP2.*pDirPt )
+{
//If the starting point lies in a fly, it is directly set behind the
//fly.
//The end point moves to the start if the end point lies in a fly or we
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index ff03015..e2600e3 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -741,6 +741,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm*
pBehind, SwFrm* pSct )
pBehind-pPrev = pLast;
}
else
+{
//Insert at the end, or ... the first node in the subtree
pPrev = pUpper-Lower();
if ( pPrev )
@@ -931,6 +932,7 @@ void SwCntntFrm::Cut()
}
if( 0 != (pFrm = GetIndNext()) )
+{
//The old follower may calculated a gap to the predecessor which now
//becomes obsolete or different respectively as it becomes the first
//one itself.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.Android README.cross
README.Android |2 +- README.cross |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 739252d04397a4fcf3f044de86e3bfaec0084c4d Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 27 14:16:54 2012 + android: remove obsolete sourcing of Env.Host.sh advice diff --git a/README.Android b/README.Android index e96597e..be1d765 100644 --- a/README.Android +++ b/README.Android @@ -15,7 +15,7 @@ Then it is necessary to get stdout/err to go to somewhere we can find it: Then: - . Env.Host.sh + make cmd cmd=bash cd android/qa/sc make clean all install make run ; adb shell logcat diff --git a/README.cross b/README.cross index a1edd27..e2b9f21 100644 --- a/README.cross +++ b/README.cross @@ -387,7 +387,7 @@ The activity used for these apps is in android/Bootstrap. See README.Android. To build the complex unit test (for Calc functionality; invokes the -ucalc unit test code from sc) source the environment (. Env.Host.sh) +ucalc unit test code from sc) setup your environment (make cmd cmd=bash) and cd to android/qa/sc and run a make. The Makefile here is completely manually written, this stuff is so experimental it doesn't make sense yet to try to integrate with the normal gbuild ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/source offapi/com
avmedia/source/gstreamer/gstplayer.cxx | 26 -
avmedia/source/gstreamer/gstplayer.hxx |3 --
avmedia/source/quicktime/player.hxx|3 --
avmedia/source/quicktime/player.mm | 34 -
avmedia/source/win/player.cxx | 31 --
avmedia/source/win/player.hxx |3 --
offapi/com/sun/star/media/XPlayer.idl | 20 ---
7 files changed, 120 deletions(-)
New commits:
commit 55d52165df003d253d813f3ea7085f4d89fdb3ce
Author: Bartolomé Sánchez Salado aliaselba...@gmail.com
Date: Sat Feb 25 19:34:35 2012 +0100
Removed unused code.
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index fa1dcbd..ee54965 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -396,32 +396,6 @@ double SAL_CALL Player::getMediaTime( )
//
--
-void SAL_CALL Player::setStopTime( double /*fTime*/ )
-throw (uno::RuntimeException)
-{
-// TODO implement
-}
-
-//
--
-
-double SAL_CALL Player::getStopTime( )
-throw (uno::RuntimeException)
-{
-// Get the time at which to stop
-
-return 0;
-}
-
-//
--
-
-void SAL_CALL Player::setRate( double /*fRate*/ )
-throw (uno::RuntimeException)
-{
-// TODO set the window rate
-}
-
-//
--
-
double SAL_CALL Player::getRate( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/gstreamer/gstplayer.hxx
b/avmedia/source/gstreamer/gstplayer.hxx
index 0e04d67..b5d7d83 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -62,9 +62,6 @@ public:
virtual double SAL_CALL getDuration( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setStopTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
-virtual double SAL_CALL getStopTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setRate( double fRate ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw
(::com::sun::star::uno::RuntimeException);
diff --git a/avmedia/source/quicktime/player.hxx
b/avmedia/source/quicktime/player.hxx
index da9bbfc..ec795fd 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -59,9 +59,6 @@ public:
virtual double SAL_CALL getDuration( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setStopTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
-virtual double SAL_CALL getStopTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setRate( double fRate ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw
(::com::sun::star::uno::RuntimeException);
diff --git a/avmedia/source/quicktime/player.mm
b/avmedia/source/quicktime/player.mm
index e4550a0..15c39e9 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -226,40 +226,6 @@ double SAL_CALL Player::getMediaTime( )
//
--
-void SAL_CALL Player::setStopTime( double fTime )
-throw (uno::RuntimeException)
-{
-OSL_TRACE (Player::setStopTime %f, fTime);
-
-mnStopTime = fTime;
-}
-
-//
--
-
-double SAL_CALL Player::getStopTime( )
-throw (uno::RuntimeException)
-{
-double fRet = mnStopTime;
-
-return fRet;
-}
-
-//
--
-
-void SAL_CALL Player::setRate( double fRate )
-throw (uno::RuntimeException)
-{
-OSL_TRACE (Player::setRate);
-
-// Quicktime: 0 = stop, 1 =
[Libreoffice-commits] .: cppuhelper/inc registry/inc sal/inc
cppuhelper/inc/cppuhelper/factory.hxx |6 +++--- cppuhelper/inc/cppuhelper/implementationentry.hxx |2 +- registry/inc/registry/registry.hxx|6 +++--- sal/inc/rtl/ustring.hxx |2 +- 4 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 0f6d1ff62131bd7664a125aa85b1738d79949bef Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com Date: Sun Feb 26 05:20:44 2012 +0700 some doxygen warnings cleanup diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index e97a2f8..4b34c37 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.hxx @@ -207,7 +207,7 @@ createSingleFactory( The XComponent interface is not supported! @param rServiceManager the service manager used by the implementation. -@param xSingleServiceFactorythe wrapped service factory. +@param rFactory the wrapped service factory. @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory. @@ -223,7 +223,7 @@ createFactoryProxy( /** Deprecated. Creates a single service factory which holds the instance created only once. @param rServiceManager the service manager used by the implementation. -@param rImplementationName the implementation name. An empty string is possible. +@param rComponentName the implementation name. An empty string is possible. @param pCreateFunction the function pointer to create an object. @param rServiceNamesthe service supported by the implementation. @param pModCountfor future extension (library unloading concept). @@ -262,7 +262,7 @@ createSingleRegistryFactory( based on a registry. @param rServiceManager the service manager used by the implementation. -@param rImplementationName the implementation name. An empty string is possible. +@param rComponentName the implementation name. An empty string is possible. @param rImplementationKey the registry key of the implementation section. @return a factory that support the interfaces XServiceProvider, XServiceInfo XSingleServiceFactory and XComponent. diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx index 2c7a08e..173501d 100644 --- a/cppuhelper/inc/cppuhelper/implementationentry.hxx +++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx @@ -74,7 +74,7 @@ struct ImplementationEntry /** Helper function for implementation of the component_writeInfo()-function. -@obsolete component_writeInfo should no longer be used in new components +@deprecated component_writeInfo should no longer be used in new components @param pServiceManager The first parameter passed to component_writeInfo()-function (This is an instance of the service manager, that creates the factory). diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx index 86968de..50e1544 100644 --- a/registry/inc/registry/registry.hxx +++ b/registry/inc/registry/registry.hxx @@ -600,7 +600,7 @@ public: /** used to create a link. -@obsolete Links are no longer supported. +@deprecated Links are no longer supported. @return REG_INVALID_LINK */ @@ -609,7 +609,7 @@ public: /** used to delete a link. -@obsolete Links are no longer supported. +@deprecated Links are no longer supported. @return REG_INVALID_LINK */ @@ -626,7 +626,7 @@ public: /** used to return the target of a link. -@obsolete Links are no longer supported. +@deprecated Links are no longer supported. @return REG_INVALID_LINK */ diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index f55fb7d..27eb865 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -173,7 +173,7 @@ public: assumed to be only UTF-8/ASCII, so this constructor allows an efficient and convenient way to create OUString instances from literals. - @paramvalue the 8-bit string literal + @paramliteral the 8-bit string literal @exception std::bad_alloc is thrown if an out-of-memory condition occurs */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/Module_basctl.mk basic/Module_basic.mk config_host.mk.in configure.in Makefile postprocess/packcomponents RepositoryFixes.mk sc/Module_sc.mk scripting/Module_scripting.
Makefile |6 +++--- RepositoryFixes.mk |2 +- basctl/Module_basctl.mk|2 +- basic/Module_basic.mk |2 +- config_host.mk.in |2 +- configure.in | 30 +++--- postprocess/packcomponents/makefile.mk |2 +- sc/Module_sc.mk|2 +- scripting/Module_scripting.mk |2 +- solenv/gbuild/CppunitTest.mk |2 +- solenv/gbuild/gbuild.mk|4 ++-- sw/Module_sw.mk|2 +- vbahelper/Module_vbahelper.mk |2 +- 13 files changed, 30 insertions(+), 30 deletions(-) New commits: commit c16bc826379b2e70fe517d608055ef167c5a5c9e Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 16:31:42 2012 +0200 s/interpreters/scripting/ diff --git a/Makefile b/Makefile index c2c6cbe..4bdd183 100644 --- a/Makefile +++ b/Makefile @@ -382,12 +382,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) -ifeq ($(DISABLE_INTERPRETERS),TRUE) +ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from basic and vbahelper delivered because # as we don't link to any libs from those they won't otherwise be, or # something. And we still do include those headers always even if the -# libs aren't built in the --disable-interpreters case. (Ifdefs for -# DISABLE_INTERPRETERS will be added to the code later as necessary.) +# libs aren't built in the --disable-scripting case. (Ifdefs for +# DISABLE_SCRIPTING will be added to the code later as necessary.) $(GNUMAKE) basic vbahelper endif ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 57946ad..ef2b957 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -130,7 +130,7 @@ endif # ifeq ($(COM),GCC) endif # ifeq ($(OS),WNT) -ifeq (,$(filter INTERPRETERS,$(BUILD_TYPE))) +ifeq (,$(filter SCRIPTING,$(BUILD_TYPE))) gb_Library_FILENAMES := $(patsubst sb:libsb%,,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES)) diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 68178ae..bda9d32 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,basctl)) -ifneq ($(DISABLE_INTERPRETERS),TRUE) +ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,basctl,\ AllLangResTarget_basctl \ diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index 261f6e6..bbd9b61 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,basic)) -ifneq ($(DISABLE_INTERPRETERS),TRUE) +ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,basic,\ AllLangResTarget_sb \ diff --git a/config_host.mk.in b/config_host.mk.in index 535b25b..5cc0b86 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -79,7 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@ export DISABLE_ATL=@DISABLE_ATL@ export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@ -export DISABLE_INTERPRETERS=@DISABLE_INTERPRETERS@ +export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ export DISABLE_PYTHON=@DISABLE_PYTHON@ diff --git a/configure.in b/configure.in index d7681d6..914e8cf 100644 --- a/configure.in +++ b/configure.in @@ -393,8 +393,8 @@ AC_ARG_ENABLE(database-connectivity, [Disable various database connectivity. Work in progress, use only if you are hacking on it.]) ) -AC_ARG_ENABLE(interpreters, -AS_HELP_STRING([--disable-interpreters], +AC_ARG_ENABLE(scripting, +AS_HELP_STRING([--disable-scripting], [Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) ) @@ -2042,21 +2042,21 @@ else fi AC_SUBST(DISABLE_DBCONNECTIVITY) -if test -z $enable_interpreters; then -# Disable interpreters for iOS unless specifically overridden -# with --enable-interpreters. +if test -z $enable_scripting; then +# Disable scripting for iOS unless specifically overridden +# with --enable-scripting. if test $_os != iOS; then -enable_interpreters=yes +enable_scripting=yes fi fi -DISABLE_INTERPRETERS='' -if test $enable_interpreters = yes; then -BUILD_TYPE=$BUILD_TYPE INTERPRETERS +DISABLE_SCRIPTING='' +if test $enable_scripting = yes; then +BUILD_TYPE=$BUILD_TYPE SCRIPTING else -DISABLE_INTERPRETERS='TRUE' +DISABLE_SCRIPTING='TRUE' fi -AC_SUBST(DISABLE_INTERPRETERS) +AC_SUBST(DISABLE_SCRIPTING) dnl === dnl Extra check for Windows. Cygwin builds need gcc to build dmake @@ -4535,8 +4535,8 @@ dnl Java
[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild
config_host.mk.in |1 + configure.in| 21 + solenv/gbuild/gbuild.mk |4 3 files changed, 26 insertions(+) New commits: commit 651dcc29f413b6bb95e01c90d4113ff7a10db3be Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 17:02:59 2012 +0200 Add --disable-extensions switch for future implementation diff --git a/config_host.mk.in b/config_host.mk.in index 5cc0b86..d206cb5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -79,6 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@ export DISABLE_ATL=@DISABLE_ATL@ export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@ +export DISABLE_EXTENSIONS=@DISABLE_EXTENSIONS@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ diff --git a/configure.in b/configure.in index 914e8cf..86db768 100644 --- a/configure.in +++ b/configure.in @@ -393,6 +393,11 @@ AC_ARG_ENABLE(database-connectivity, [Disable various database connectivity. Work in progress, use only if you are hacking on it.]) ) +AC_ARG_ENABLE(extensions, +AS_HELP_STRING([--disable-extensions], +[Disable all add-on extension functionality. Work in progress, use only if you are hacking on it.]) +) + AC_ARG_ENABLE(scripting, AS_HELP_STRING([--disable-scripting], [Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) @@ -2042,6 +2047,22 @@ else fi AC_SUBST(DISABLE_DBCONNECTIVITY) +if test -z $enable_extensions; then +# For iOS disable extensions unless specifically overridden with +# --enable-extensions. +if test $_os != iOS; then +enable_extensions=yes +fi +fi + +DISABLE_EXTENSIONS='' +if test $enable_extensions = yes; then +BUILD_TYPE=$BUILD_TYPE EXTENSIONS +else +DISABLE_EXTENSIONS='TRUE' +fi +AC_SUBST(DISABLE_EXTENSIONS) + if test -z $enable_scripting; then # Disable scripting for iOS unless specifically overridden # with --enable-scripting. diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index e38137e..2aafa6b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -236,6 +236,10 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif +ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) +gb_GLOBALDEFS += -DDISABLE_EXTENSIONS +endif + ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) gb_GLOBALDEFS += -DDISABLE_SCRIPTING endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/localize.cxx | 203 ++
1 file changed, 109 insertions(+), 94 deletions(-)
New commits:
commit ad549adecb7c68f0bd741c351e818af5e59f671e
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 27 16:08:18 2012 +0100
Make localize follow clone/* instead of symlinks
...so that it works on Windows.
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 9e0cf0b..211b647 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -282,76 +282,6 @@ void handleFile(
}
}
-bool includeDirectory(rtl::OUString const directory) {
-// Cf. OUTPATH=* in configure.in:
-static AsciiString const excluded[] = {
-{ RTL_CONSTASCII_STRINGPARAM(unxaig) },
-{ RTL_CONSTASCII_STRINGPARAM(unxand) },
-{ RTL_CONSTASCII_STRINGPARAM(unxdfly) },
-{ RTL_CONSTASCII_STRINGPARAM(unxfbsd) },
-{ RTL_CONSTASCII_STRINGPARAM(unxios) },
-{ RTL_CONSTASCII_STRINGPARAM(unxkfg) },
-{ RTL_CONSTASCII_STRINGPARAM(unxlng) },
-{ RTL_CONSTASCII_STRINGPARAM(unxmac) },
-{ RTL_CONSTASCII_STRINGPARAM(unxnbsd) },
-{ RTL_CONSTASCII_STRINGPARAM(unxobsd) },
-{ RTL_CONSTASCII_STRINGPARAM(unxsog) },
-{ RTL_CONSTASCII_STRINGPARAM(unxsol) },
-{ RTL_CONSTASCII_STRINGPARAM(unxubt) },
-{ RTL_CONSTASCII_STRINGPARAM(wntmsc) } };
-for (std::size_t i = 0; i != SAL_N_ELEMENTS(excluded); ++i) {
-if (directory.matchAsciiL(excluded[i].string, excluded[i].length)) {
-return false;
-}
-}
-return true;
-}
-
-void handleDirectory(
-rtl::OUString const project, rtl::OUString const projectRoot,
-rtl::OUString const url)
-{
-osl::Directory dir(url);
-if (dir.open() != osl::FileBase::E_None) {
-std::cerr Error: Cannot open directory:
OUStringToOString(url, RTL_TEXTENCODING_ASCII_US).getStr() std::endl;
-throw false; //TODO
-}
-for (;;) {
-osl::DirectoryItem item;
-osl::FileBase::RC e = dir.getNextItem(item);
-if (e == osl::FileBase::E_NOENT) {
-break;
-}
-if (e != osl::FileBase::E_None) {
-std::cerr Error: Cannot read directory\n;
-throw false; //TODO
-}
-osl::FileStatus stat(
-osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName
-| osl_FileStatus_Mask_FileURL);
-if (item.getFileStatus(stat) != osl::FileBase::E_None) {
-std::cerr Error: Cannot get file status\n;
-throw false; //TODO
-}
-if (stat.getFileType() == osl::FileStatus::Directory) {
-if (includeDirectory(stat.getFileName())) {
-rtl::OUString pr(projectRoot);
-if (!pr.isEmpty()) {
-pr += rtl::OUString('/');
-}
-pr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(..));
-handleDirectory(project, pr, stat.getFileURL());
-}
-} else {
-handleFile(project, projectRoot, stat.getFileURL());
-}
-}
-if (dir.close() != osl::FileBase::E_None) {
-std::cerr Error: Cannot close directory\n;
-throw false; //TODO
-}
-}
-
bool includeProject(rtl::OUString const project) {
static char const * projects[] = {
accessibility,
@@ -409,28 +339,57 @@ bool includeProject(rtl::OUString const project) {
return false;
}
-void handleProjects(char const * root) {
-rtl::OUString root16;
-if (!rtl_convertStringToUString(
-root16.pData, root, rtl_str_getLength(root),
-osl_getThreadTextEncoding(),
-(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
- | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
- | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
-{
-std::cerr Error: Cannot convert pathname to UTF-16\n;
-throw false; //TODO
-}
-rtl::OUString rootUrl;
-if (osl::FileBase::getFileURLFromSystemPath(root16, rootUrl)
-!= osl::FileBase::E_None)
-{
-std::cerr Error: Cannot convert pathname to URL\n;
-throw false; //TODO
+bool excludeDirectory(rtl::OUString const directory) {
+// Cf. OUTPATH=* in configure.in:
+static AsciiString const excluded[] = {
+{ RTL_CONSTASCII_STRINGPARAM(unxaig) },
+{ RTL_CONSTASCII_STRINGPARAM(unxand) },
+{ RTL_CONSTASCII_STRINGPARAM(unxdfly) },
+{ RTL_CONSTASCII_STRINGPARAM(unxfbsd) },
+{ RTL_CONSTASCII_STRINGPARAM(unxios) },
+{ RTL_CONSTASCII_STRINGPARAM(unxkfg) },
+{ RTL_CONSTASCII_STRINGPARAM(unxlng) },
+{ RTL_CONSTASCII_STRINGPARAM(unxmac) },
+{ RTL_CONSTASCII_STRINGPARAM(unxnbsd) },
+{ RTL_CONSTASCII_STRINGPARAM(unxobsd) },
+{ RTL_CONSTASCII_STRINGPARAM(unxsog) },
+{ RTL_CONSTASCII_STRINGPARAM(unxsol) },
+{
[Libreoffice-commits] .: fpicker/Library_fps_kde.mk
fpicker/Library_fps_kde.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e3e2dca75a271851bd96e90ed1302a92a0f464d Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 27 16:17:54 2012 +0100 Typo diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk index d833763..d7878ef 100644 --- a/fpicker/Library_fps_kde.mk +++ b/fpicker/Library_fps_kde.mk @@ -53,6 +53,6 @@ $(eval $(call gb_Library_add_cxxflags,fps_kde,\ -Wno-shadow \ )) -$(eval $(call gb_LIbrary_set_warnings_not_errors,fps_kde)) +$(eval $(call gb_Library_set_warnings_not_errors,fps_kde)) # 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 |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 143974d637283b884b2b2c5b108248e353c2e734 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 17:15:52 2012 +0200 $_os is iOS for iOS, not IOS diff --git a/configure.in b/configure.in index 86db768..884d1c8 100644 --- a/configure.in +++ b/configure.in @@ -5776,7 +5776,7 @@ if test $with_system_libwpd = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 ) -elif test $_os = IOS; then +elif test $_os = iOS; then AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) @@ -5829,7 +5829,7 @@ if test $with_system_libwps = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBWPS=YES PKG_CHECK_MODULES( WPS, libwps-0.2 ) -elif test $_os = IOS; then +elif test $_os = iOS; then AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) @@ -5848,7 +5848,7 @@ if test $with_system_libwpg = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBWPG=YES PKG_CHECK_MODULES( WPG, libwpg-0.2 ) -elif test $_os = IOS; then +elif test $_os = iOS; then AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 +++ 1 file changed, 3 insertions(+) New commits: commit b55381672262f7d14a5b66ddd6a2dd1007ee8e3b Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 17:54:28 2012 +0200 libcdr depends on libwpd and libwpg so don't use it either on iOS then diff --git a/configure.in b/configure.in index 884d1c8..fe35ab3 100644 --- a/configure.in +++ b/configure.in @@ -5724,6 +5724,9 @@ if test $with_system_libcdr = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBCDR=YES PKG_CHECK_MODULES( CDR, libcdr-0.0 ) +elif test $_os = iOS; then +# libcdr depends on libwpd and libwpg and those are LGPL +AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_LIBCDR=NO ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d281971d62cc52c496487933ec699605f1a9b209
Author: Cameron Paul cpau...@gmail.com
Date: Mon Feb 27 15:56:03 2012 +
fdo#46438 - add ctrl-g / ctrl-shift-g binding for find again fwd/back
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 16d4d55..c974a22 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -133,6 +133,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
sal_Bool bShift = pKeyEvent-GetKeyCode().IsShift();
+sal_Bool bMod1 = pKeyEvent-GetKeyCode().IsMod1();
sal_uInt16 nCode = pKeyEvent-GetKeyCode().GetCode();
if ( KEY_ESCAPE == nCode )
@@ -156,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
}
}
-if ( KEY_RETURN == nCode )
+if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) )
{
Remember_Impl(GetText());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - libcroco/makefile.mk librsvg/makefile.mk redland/rasqal redland/redland
libcroco/makefile.mk|2 +- librsvg/makefile.mk | 16 +--- redland/rasqal/makefile.mk |4 redland/redland/makefile.mk |4 4 files changed, 22 insertions(+), 4 deletions(-) New commits: commit bc09b5b62f1eac7a59340d549a5670d732b9a47c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 10:52:50 2012 +0100 Make redland build on Mac with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 71bee48..7a37759 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -113,6 +113,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # $(SYSBASE)!= +.IF $(OS)==MACOSX $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 6113531..1268cbe 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -115,6 +115,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .IF $(OS)==MACOSX LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.IF $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + .ENDIF CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) commit 1ec7e749a39a39c6fb172232ca4c6a18dc8a0f4e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 09:24:42 2012 +0100 Make librsvg link with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 63f45e3..0ffbdee 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF +.IF $(SYSTEM_LIBXML) == YES +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +my_dylib_file= +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +my_dylib_file=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ - LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS) \ - LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl \ + LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags) \ + LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl \ GDK_PIXBUF_CFLAGS=-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ @@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ LIBCROCO_CFLAGS=-I$(SOLARINCDIR)/external/libcroco-0.6 \ LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo \ - LDFLAGS=$(CONFIGURE_LDFLAGS) + LDFLAGS=$(CONFIGURE_LDFLAGS) $(my_dylib_file) CONFIGURE_FLAGS+= CPPFLAGS=$(ARCH_FLAGS) $(EXTRA_CDEFS) commit b248c3f96b0871779fb01056985413c0372cbcd9 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sun Feb 26 00:02:28 2012 +0100 Fix libcroco build against internal libxml2 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 28c588b..8855f8d 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -55,7 +55,7 @@ CONFIGURE_DIR= my_libxml2_cflags=$(LIBXML_CFLAGS) my_libxml2_libs=$(LIBXML_LIBS) .ELSE -my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml
[Libreoffice-commits] .: cui/source
cui/source/dialogs/SpellDialog.cxx | 175 ++---
1 file changed, 86 insertions(+), 89 deletions(-)
New commits:
commit adf45eced404c33be6db884a3e809725e7975872
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 27 17:00:40 2012 +0100
fdo#46531: Fixed SpellCheck dialog display issues
More robust, handling of the explanations message and link display.
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 483058e..cd9b273 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -402,6 +402,92 @@ void SpellDialog::UpdateBoxes_Impl()
aIgnoreRulePB.Enable(pSpellErrorDescription
!pSpellErrorDescription-sRuleId.isEmpty());
aAutoCorrPB.Show( bShowChangeAll rParent.HasAutoCorrection() );
+bool bHasGrammarChecking = rParent.HasGrammarChecking();
+aCheckGrammarCB.Show( bHasGrammarChecking );
+if( !bHasGrammarChecking )
+{
+//resize the dialog to hide the hidden area of the CheckBox
+Size aBackSize = aBackgroundGB.GetSizePixel();
+sal_Int32 nDiff = aBackgroundGB.GetPosPixel().Y() + aBackSize.Height()
+- aCheckGrammarCB.GetPosPixel().Y();
+aBackSize.Height() -= nDiff;
+aBackgroundGB.SetSizePixel(aBackSize);
+Button* aButtons[] = { aHelpPB, aOptionsPB, aUndoPB, aClosePB, 0 };
+sal_Int32 nButton = 0;
+while( aButtons[nButton])
+{
+Point aPos = aButtons[nButton]-GetPosPixel();
+aPos.Y() -= nDiff;
+aButtons[nButton]-SetPosPixel(aPos);
+++nButton;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() -= nDiff;
+SetSizePixel( aDlgSize );
+}
+else
+{
+bool bHasExplainLink = aExplainLink.GetURL().Len() != 0;
+aExplainLink.Show( bHasExplainLink );
+
+sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() -
aExplainFT.GetPosPixel().X();
+if ( !bHasExplainLink )
+nExplainWidth += aExplainLink.GetSizePixel().Width();
+sal_Int32 nExplainHeight = aExplainFT.GetActualHeight();
+sal_Int32 nCurrentHeight = aExplainFT.GetSizePixel().Height();
+if( aExplainFT.GetText().Len() == 0 )
+{
+nExplainHeight = 0;
+aExplainFT.Hide();
+aExplainLink.Hide();
+}
+
+Size aCtlSize = aExplainFT.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aCtlSize.Width() = nExplainWidth;
+aExplainFT.SetSizePixel( aCtlSize );
+
+aCtlSize = aExplainLink.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aExplainLink.SetSizePixel( aCtlSize );
+
+sal_Int32 nDiff = - ( nCurrentHeight - nExplainHeight );
+if ( nDiff != 0 )
+{
+Control* aControls[] = {
+aNotInDictFT,
+aSentenceED,
+aSuggestionFT,
+aSuggestionLB,
+aIgnorePB,
+aIgnoreAllPB,
+aIgnoreRulePB,
+aAddToDictMB,
+aChangePB,
+aChangeAllPB,
+aAutoCorrPB,
+aCheckGrammarCB,
+aHelpPB,
+aOptionsPB,
+aUndoPB,
+aClosePB,
+aBackgroundGB,
+0
+};
+sal_Int32 nControl = 0;
+while( aControls[nControl])
+{
+Point aPos = aControls[nControl]-GetPosPixel();
+aPos.Y() += nDiff;
+aControls[nControl]-SetPosPixel(aPos);
+++nControl;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() += nDiff;
+SetSizePixel( aDlgSize );
+Invalidate();
+}
+}
}
// ---
@@ -468,95 +554,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *,
EMPTYARG )
pThis-aClosePB.GrabFocus();
pThis-LockFocusChanges(false);
//show grammar CheckBox depending on the modules abilities
-bool bHasGrammarChecking = pThis-rParent.HasGrammarChecking();
-pThis-aCheckGrammarCB.Show( bHasGrammarChecking );
-if( !bHasGrammarChecking )
-{
-//resize the dialog to hide the hidden area of the CheckBox
-Size aBackSize = pThis-aBackgroundGB.GetSizePixel();
-sal_Int32 nDiff = pThis-aBackgroundGB.GetPosPixel().Y() +
aBackSize.Height()
-- pThis-aCheckGrammarCB.GetPosPixel().Y();
-aBackSize.Height() -= nDiff;
-pThis-aBackgroundGB.SetSizePixel(aBackSize);
-Button* aButtons[] = { pThis-aHelpPB, pThis-aOptionsPB,
pThis-aUndoPB, pThis-aClosePB, 0 };
-sal_Int32 nButton = 0;
-while( aButtons[nButton])
-{
-Point aPos =
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - 3 commits - libcroco/makefile.mk librsvg/makefile.mk redland/rasqal redland/redland
libcroco/makefile.mk|2 +- librsvg/makefile.mk | 16 +--- redland/rasqal/makefile.mk |4 redland/redland/makefile.mk |4 4 files changed, 22 insertions(+), 4 deletions(-) New commits: commit d87bbaf9bccc25b189ff11d8231ca210c69ce738 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 10:52:50 2012 +0100 Make redland build on Mac with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz (cherry picked from commit bc09b5b62f1eac7a59340d549a5670d732b9a47c) Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 71bee48..7a37759 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -113,6 +113,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # $(SYSBASE)!= +.IF $(OS)==MACOSX $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 6113531..1268cbe 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -115,6 +115,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .IF $(OS)==MACOSX LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.IF $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + .ENDIF CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) commit a44ee7caef5a1a5965e01ed598706e904dfc2253 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 09:24:42 2012 +0100 Make librsvg link with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz (cherry picked from commit 1ec7e749a39a39c6fb172232ca4c6a18dc8a0f4e) Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 63f45e3..0ffbdee 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF +.IF $(SYSTEM_LIBXML) == YES +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +my_dylib_file= +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +my_dylib_file=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ - LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS) \ - LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl \ + LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags) \ + LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl \ GDK_PIXBUF_CFLAGS=-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ @@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ LIBCROCO_CFLAGS=-I$(SOLARINCDIR)/external/libcroco-0.6 \ LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo \ - LDFLAGS=$(CONFIGURE_LDFLAGS) + LDFLAGS=$(CONFIGURE_LDFLAGS) $(my_dylib_file) CONFIGURE_FLAGS+= CPPFLAGS=$(ARCH_FLAGS) $(EXTRA_CDEFS) commit 85a5fb3d2138def25832b9921a8200d168301447 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sun Feb 26 00:02:28 2012 +0100 Fix libcroco build against
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sw/source
sw/source/core/docnode/ndtbl1.cxx | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 3aeba34bc8fb66ef8530be336531763bc34afa37
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Feb 26 19:09:54 2012 +0400
fdo#46144: Distributy Columns Evenly does not work with the selected
columns
regression from f7303fcac779f99931bfba48e8bfcf9c081af67f:
-SvUShorts aWish( nTmp, nTmp ),
+std::vectorsal_uInt16 aWish( nTmp, nTmp ),
aMins( nTmp, nTmp );
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com
(cherry picked from commit 4f8094d0489d31563f18fb31bad366be2c19046f)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 817b1ac..4524a58 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1469,16 +1469,11 @@ void SwDoc::AdjustCellWidth( const SwCursor rCursor,
sal_Bool bBalance )
if ( ! aTabCols.Count() )
return;
-const sal_uInt8 nTmp = (sal_uInt8)Max( sal_uInt16(255),
sal_uInt16(aTabCols.Count() + 1) );
-std::vectorsal_uInt16 aWish( nTmp, nTmp ),
- aMins( nTmp, nTmp );
+std::vectorsal_uInt16 aWish(aTabCols.Count() + 1);
+std::vectorsal_uInt16 aMins(aTabCols.Count() + 1);
+
sal_uInt16 i;
-for ( i = 0; i = aTabCols.Count(); ++i )
-{
-aWish.push_back( 0 );
-aMins.push_back( 0 );
-}
::lcl_CalcColValues( aWish, aTabCols, pStart, pEnd, sal_True );
//Es ist Robuster wenn wir die Min-Werte fuer die ganze Tabelle berechnen.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/dialogs/SpellDialog.cxx | 175 ++---
1 file changed, 86 insertions(+), 89 deletions(-)
New commits:
commit c2c65d4f30cddb0528e8e9ef24e3d42a68ada25c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 27 17:00:40 2012 +0100
fdo#46531: Fixed SpellCheck dialog display issues
More robust, handling of the explanations message and link display.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index cb68f6b..feb6a7e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -403,6 +403,92 @@ void SpellDialog::UpdateBoxes_Impl()
aIgnoreRulePB.Enable(pSpellErrorDescription
pSpellErrorDescription-sRuleId.getLength());
aAutoCorrPB.Show( bShowChangeAll rParent.HasAutoCorrection() );
+bool bHasGrammarChecking = rParent.HasGrammarChecking();
+aCheckGrammarCB.Show( bHasGrammarChecking );
+if( !bHasGrammarChecking )
+{
+//resize the dialog to hide the hidden area of the CheckBox
+Size aBackSize = aBackgroundGB.GetSizePixel();
+sal_Int32 nDiff = aBackgroundGB.GetPosPixel().Y() + aBackSize.Height()
+- aCheckGrammarCB.GetPosPixel().Y();
+aBackSize.Height() -= nDiff;
+aBackgroundGB.SetSizePixel(aBackSize);
+Button* aButtons[] = { aHelpPB, aOptionsPB, aUndoPB, aClosePB, 0 };
+sal_Int32 nButton = 0;
+while( aButtons[nButton])
+{
+Point aPos = aButtons[nButton]-GetPosPixel();
+aPos.Y() -= nDiff;
+aButtons[nButton]-SetPosPixel(aPos);
+++nButton;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() -= nDiff;
+SetSizePixel( aDlgSize );
+}
+else
+{
+bool bHasExplainLink = aExplainLink.GetURL().Len() != 0;
+aExplainLink.Show( bHasExplainLink );
+
+sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() -
aExplainFT.GetPosPixel().X();
+if ( !bHasExplainLink )
+nExplainWidth += aExplainLink.GetSizePixel().Width();
+sal_Int32 nExplainHeight = aExplainFT.GetActualHeight();
+sal_Int32 nCurrentHeight = aExplainFT.GetSizePixel().Height();
+if( aExplainFT.GetText().Len() == 0 )
+{
+nExplainHeight = 0;
+aExplainFT.Hide();
+aExplainLink.Hide();
+}
+
+Size aCtlSize = aExplainFT.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aCtlSize.Width() = nExplainWidth;
+aExplainFT.SetSizePixel( aCtlSize );
+
+aCtlSize = aExplainLink.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aExplainLink.SetSizePixel( aCtlSize );
+
+sal_Int32 nDiff = - ( nCurrentHeight - nExplainHeight );
+if ( nDiff != 0 )
+{
+Control* aControls[] = {
+aNotInDictFT,
+aSentenceED,
+aSuggestionFT,
+aSuggestionLB,
+aIgnorePB,
+aIgnoreAllPB,
+aIgnoreRulePB,
+aAddToDictMB,
+aChangePB,
+aChangeAllPB,
+aAutoCorrPB,
+aCheckGrammarCB,
+aHelpPB,
+aOptionsPB,
+aUndoPB,
+aClosePB,
+aBackgroundGB,
+0
+};
+sal_Int32 nControl = 0;
+while( aControls[nControl])
+{
+Point aPos = aControls[nControl]-GetPosPixel();
+aPos.Y() += nDiff;
+aControls[nControl]-SetPosPixel(aPos);
+++nControl;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() += nDiff;
+SetSizePixel( aDlgSize );
+Invalidate();
+}
+}
}
// ---
@@ -469,95 +555,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *,
EMPTYARG )
pThis-aClosePB.GrabFocus();
pThis-LockFocusChanges(false);
//show grammar CheckBox depending on the modules abilities
-bool bHasGrammarChecking = pThis-rParent.HasGrammarChecking();
-pThis-aCheckGrammarCB.Show( bHasGrammarChecking );
-if( !bHasGrammarChecking )
-{
-//resize the dialog to hide the hidden area of the CheckBox
-Size aBackSize = pThis-aBackgroundGB.GetSizePixel();
-sal_Int32 nDiff = pThis-aBackgroundGB.GetPosPixel().Y() +
aBackSize.Height()
-- pThis-aCheckGrammarCB.GetPosPixel().Y();
-aBackSize.Height() -= nDiff;
-pThis-aBackgroundGB.SetSizePixel(aBackSize);
-Button* aButtons[] = { pThis-aHelpPB, pThis-aOptionsPB,
pThis-aUndoPB, pThis-aClosePB, 0 };
-sal_Int32 nButton = 0;
-while(
[Libreoffice-commits] .: sw/source tools/inc
sw/source/ui/envelp/labfmt.cxx |2 +- tools/inc/tools/color.hxx |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit a3b0be108677c60653eb79187a45bbd447d5e21b Author: Winfried Donkers o...@dci-electronics.nl Date: Mon Feb 27 16:21:33 2012 +0100 fdo44516 cleanup of direct use of color in code diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 6ec2a79..d5208dd 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -173,7 +173,7 @@ void SwLabPreview::Paint(const Rectangle ) // Labels SetClipRegion (Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))); -SetFillColor( Color( 0xE0, 0xE0, 0xFF ) ); +SetFillColor( COL_LIGHTGRAYBLUE ); for (sal_uInt16 nRow = 0; nRow Min((sal_uInt16) 2, (sal_uInt16) aItem.nRows); nRow++) for (sal_uInt16 nCol = 0; nCol Min((sal_uInt16) 2, (sal_uInt16) aItem.nCols); nCol++) DrawRect(Rectangle( diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index a9fe589..4594de6 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -74,6 +74,7 @@ typedef sal_uInt32 ColorData; #define COL_LIGHTCYAN RGB_COLORDATA( 0x00, 0xFF, 0xFF ) #define COL_LIGHTREDRGB_COLORDATA( 0xFF, 0x00, 0x00 ) #define COL_LIGHTMAGENTARGB_COLORDATA( 0xFF, 0x00, 0xFF ) +#define COL_LIGHTGRAYBLUE RGB_COLORDATA( 0xE0, 0xE0, 0xFF ) #define COL_YELLOW RGB_COLORDATA( 0xFF, 0xFF, 0x00 ) #define COL_WHITE RGB_COLORDATA( 0xFF, 0xFF, 0xFF ) #define COL_TRANSPARENT TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source sdext/source starmath/source stoc/source svtools/source svx/source
scripting/source/basprov/basmethnode.cxx |2 -
scripting/source/dlgprov/dlgprov.cxx |4 +-
sdext/source/minimizer/fileopendialog.cxx |2 -
sdext/source/minimizer/informationdialog.cxx |8 ++--
sdext/source/presenter/PresenterPaneBorderPainter.cxx |4 +-
starmath/source/unomodel.cxx |2 -
stoc/source/inspect/introspection.cxx |2 -
stoc/source/javavm/javavm.cxx |2 -
svtools/source/contnr/fileview.cxx|4 +-
svx/source/fmcomp/fmgridif.cxx|2 -
svx/source/form/fmdmod.cxx| 34 --
svx/source/xml/xmlgrhlp.cxx |2 -
12 files changed, 18 insertions(+), 50 deletions(-)
New commits:
commit 660e4481a4ab00b1077dbc5e26568b7f6f05b2ba
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 27 19:07:35 2012 +0900
Avoid temporary rtl::OUString
in scripting / sdext / starmath / stoc / svtools / svx
diff --git a/scripting/source/basprov/basmethnode.cxx
b/scripting/source/basprov/basmethnode.cxx
index b07720c..507915a 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -234,7 +234,7 @@ namespace basprov
for ( sal_Int32 i = 0; i nProps; ++i )
{
// TODO: according to MBA the property 'Title' may
change in future
-if ( pProps[i].Name ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Title)) )
+if (
pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(Title)) )
{
pProps[i].Value = sDocURL;
break;
diff --git a/scripting/source/dlgprov/dlgprov.cxx
b/scripting/source/dlgprov/dlgprov.cxx
index 3a4ceef..1c137c0 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -379,11 +379,11 @@ static ::rtl::OUString
aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM(Re
// TODO: dialogs in packages
Reference XLibraryContainer xLibContainer;
-if ( sLocation ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(application)) )
+if (
sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(application)) )
{
xLibContainer = Reference XLibraryContainer (
SFX_APP()-GetDialogContainer(), UNO_QUERY );
}
-else if ( sLocation ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(document)) )
+else if (
sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(document)) )
{
Reference XEmbeddedScripts xDocumentScripts( m_xModel,
UNO_QUERY );
if ( xDocumentScripts.is() )
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index 830e409..a012ff8 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -109,7 +109,7 @@ FileOpenDialog::FileOpenDialog( const Reference
XComponentContext rxMSF ) :
{
rtl::OUString sDocumentService;
rProperty.Value = sDocumentService;
-if ( sDocumentService == OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.PresentationDocument )
) )
+if (
sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.presentation.PresentationDocument))
)
bImpressFilter = sal_True;
else
j = aFilterProperties.getLength();
diff --git a/sdext/source/minimizer/informationdialog.cxx
b/sdext/source/minimizer/informationdialog.cxx
index 6f283d8..09db8b2 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -336,11 +336,11 @@ void InformationDialog::InitDialog()
aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(),
aTitle );
com::sun::star::uno::Reference com::sun::star::awt::XItemListener
xItemListener;
-InsertImage( *this, rtl::OUString(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(aboutimage)) ),
ImpGetStandardImage(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(private:standardimage/query)) ), 5,
5, 25, 25 );
-InsertFixedText( *this, rtl::OUString(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(fixedtext)) ), aInfoString,
PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
+InsertImage( *this,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(aboutimage)), ImpGetStandardImage(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(private:standardimage/query)) ), 5,
5, 25, 25 );
+InsertFixedText( *this,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(fixedtext)),
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/appoptio.hxx | 27
sc/inc/docoptio.hxx | 37 --
sc/inc/sc.hrc |7 +
sc/source/core/data/documen3.cxx | 29
sc/source/core/tool/appoptio.cxx | 221 +-
sc/source/core/tool/docoptio.cxx | 217 -
sc/source/ui/app/scmod.cxx| 98 +++-
sc/source/ui/docshell/docsh3.cxx |2
sc/source/ui/docshell/docsh6.cxx | 41 +--
sc/source/ui/inc/docsh.hxx|2
sc/source/ui/inc/tpformula.hxx| 10 -
sc/source/ui/optdlg/tpformula.cxx | 88 ---
12 files changed, 439 insertions(+), 340 deletions(-)
New commits:
commit 90284a5e7a1e5dcdd8e7473914db1ce6edc19f94
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Mon Feb 27 00:41:39 2012 +0100
Splitting ScDocument::SetDocOptions, moved new SetFormulaOptions to
ScDocShell
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 28eab09..ddacf92 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -52,10 +52,8 @@
#include rangelst.hxx
#include chartarr.hxx
#include chartlock.hxx
-#include compiler.hxx
#include refupdat.hxx
#include docoptio.hxx
-#include appoptio.hxx
#include viewopti.hxx
#include scextopt.hxx
#include brdcst.hxx
@@ -67,7 +65,6 @@
#include dociter.hxx
#include detdata.hxx
#include detfunc.hxx
-#include scmod.hxx// SC_MOD
#include inputopt.hxx // GetExpandRefs
#include chartlis.hxx
#include sc.hrc // SID_LINK
@@ -1938,39 +1935,10 @@ const ScDocOptions ScDocument::GetDocOptions() const
void ScDocument::SetDocOptions( const ScDocOptions rOpt )
{
-ScAppOptions rAppOpt=SC_MOD()-GetAppOptions();
-
OSL_ENSURE( pDocOptions, No DocOptions! :-( );
-//bool bUpdateFuncNames = pDocOptions-GetUseEnglishFuncName() !=
rOpt.GetUseEnglishFuncName();
*pDocOptions = rOpt;
-
xPoolHelper-SetFormTableOpt(rOpt);
-
-SetGrammar( rAppOpt.GetFormulaSyntax() );
-
-//if (bUpdateFuncNames)
-{
-// This needs to be called first since it may re-initialize the entire
-// opcode map.
-if (rAppOpt.GetUseEnglishFuncName())
-{
-// switch native symbols to English.
-ScCompiler aComp(NULL, ScAddress());
-ScCompiler::OpCodeMapPtr xMap =
aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH);
-ScCompiler::SetNativeSymbols(xMap);
-}
-else
-// re-initialize native symbols with localized function names.
-ScCompiler::ResetNativeSymbols();
-
-// Force re-population of function names for the function wizard,
function tip etc.
-ScGlobal::ResetFunctionList();
-}
-
-// Update the separators.
-ScCompiler::UpdateSeparatorsNative(
-rAppOpt.GetFormulaSepArg(), rAppOpt.GetFormulaSepArrayCol(),
rAppOpt.GetFormulaSepArrayRow());
}
const ScViewOptions ScDocument::GetViewOptions() const
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 9798306..f496211 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1088,13 +1088,9 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
}
// Do all the format updates on open documents in one go
-if ( bUpdateDocFormat pDoc )
+if ( bUpdateDocFormat pDocSh )
{
-const ScDocOptions rOpt = pDoc-GetDocOptions(); // Temporary fix to
keep
- // SettDocOption
call as is
-
- // Needs update.
-pDoc-SetDocOptions( rOpt );
+pDocSh-SetFormulaOptions( *pAppCfg );
pDocSh-SetDocumentModified();
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index f5692ef..522e9d7 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -432,6 +432,7 @@ void ScDocShell::InitOptions(bool bForLoading) //
called from InitNew and L
ScModule* pScMod = SC_MOD();
ScDocOptions aDocOpt = pScMod-GetDocOptions();
+ScAppOptions aAppOpt = pScMod-GetAppOptions();
ScViewOptions aViewOpt = pScMod-GetViewOptions();
aDocOpt.SetAutoSpell( bAutoSpell );
@@ -448,6 +449,7 @@ void ScDocShell::InitOptions(bool bForLoading) //
called from InitNew and L
aDocument.SetDocOptions( aDocOpt );
aDocument.SetViewOptions( aViewOpt );
+SetFormulaOptions( aAppOpt );
// Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index c02956c..9d054bb 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -47,9 +47,9 @@
#include viewdata.hxx
#include tabvwsh.hxx
#include tablink.hxx
-#include appoptio.hxx
#include globstr.hrc
[Libreoffice-commits] .: 2 commits - connectivity/source sw/source
connectivity/source/inc/dbase/DCode.hxx |2 -
connectivity/source/inc/dbase/DIndex.hxx | 47 +--
connectivity/source/inc/dbase/DTable.hxx | 44 -
connectivity/source/inc/dbase/dindexnode.hxx | 42
sw/source/ui/config/optdlg.src |2 -
5 files changed, 68 insertions(+), 69 deletions(-)
New commits:
commit 8b32c721c61b5c7a52284ef743586159f8f443ee
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Wed Feb 22 17:33:09 2012 +0100
Translate comments to German and fix some whitespace
diff --git a/connectivity/source/inc/dbase/DCode.hxx
b/connectivity/source/inc/dbase/DCode.hxx
index 7c5fc73..26fa112 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -50,7 +50,7 @@ namespace connectivity
const
::com::sun::star::uno::Reference ::com::sun::star::container::XNameAccess
_xIndexes=NULL);
};
-// Attribute aus einer Ergebniszeile
+// Attributes from a result row
class OFILEOperandAttr : public file::OOperandAttr
{
::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet m_xIndex;
diff --git a/connectivity/source/inc/dbase/DIndex.hxx
b/connectivity/source/inc/dbase/DIndex.hxx
index 7dcc660..34f1056 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -59,43 +59,42 @@ namespace connectivity
public:
//==
-// Kopfsatz-Struktur, verbleibt im Speicher
+// Header struct - stays in memory
//==
struct NDXHeader
{
-sal_uInt32 db_rootpage;/* Position der
Rootpage*/
-sal_uInt32 db_pagecount; /* Anzahl Pages
*/
-sal_uInt8 db_frei[4]; /* reserviert
*/
-sal_uInt16 db_keylen; /* Laenge des
Schluessels */
-sal_uInt16 db_maxkeys; /* Max. # keys pro
Seite*/
-sal_uInt16 db_keytype; /* Art des
Schluessels
- (0-Text)
- (1-Numerisch)
*/
-sal_uInt16 db_keyrec; /* Laenge eines
IndexSatzes
- SatzNr + keylen
*/
-sal_uInt8 db_frei1[3];/* reserviert
*/
-sal_uInt8 db_unique; /* eindeutig
*/
-chardb_name[488]; /* index_name
(Feldname) */
+sal_uInt32 db_rootpage;/* Rootpage
position*/
+sal_uInt32 db_pagecount; /* Page count
*/
+sal_uInt8 db_frei[4]; /* Reserved
*/
+sal_uInt16 db_keylen; /* Key length
*/
+sal_uInt16 db_maxkeys; /* Maximum number
of keys per page */
+sal_uInt16 db_keytype; /* Type of key:
+ 0 = Text
+ 1 = Numerical
*/
+sal_uInt16 db_keyrec; /* Length of an
index record
+ RecordNumber +
keylen*/
+sal_uInt8 db_frei1[3];/* Reserved
*/
+sal_uInt8 db_unique; /* Unique
*/
+chardb_name[488]; /* index_name
(field name) */
};
private:
-SvStream* m_pFileStream; // Stream zum
Lesen/Schreiben des Index
+SvStream* m_pFileStream; // Stream to
read/write the index
NDXHeader m_aHeader;
-ONDXPageListm_aCollector; // Pool von nicht
mehr benoetigten Seiten
-ONDXPagePtr m_aRoot,// Wurzel des b+
Baums
-m_aCurLeaf; // aktuelles Blatt
-sal_uInt16 m_nCurNode; // Position des
aktuellen Knoten
+
[Libreoffice-commits] .: 7 commits - bin/convwatch.py cppu/source sfx2/source solenv/gdb svl/source sw/source
bin/convwatch.py | 424 +++
cppu/source/threadpool/jobqueue.cxx |9
cppu/source/threadpool/jobqueue.hxx |6
sfx2/source/doc/sfxbasemodel.cxx | 20 -
solenv/gdb/libreoffice/__init__.py |2
solenv/gdb/libreoffice/cppu.py |2
solenv/gdb/libreoffice/sal.py|2
solenv/gdb/libreoffice/svl.py|2
solenv/gdb/libreoffice/sw.py |2
solenv/gdb/libreoffice/tl.py |2
solenv/gdb/libreoffice/util/__init__.py |2
solenv/gdb/libreoffice/util/compatibility.py |2
solenv/gdb/libreoffice/util/printing.py |2
solenv/gdb/libreoffice/util/string.py|2
solenv/gdb/libreoffice/util/uno.py |2
svl/source/inc/poolio.hxx|2
sw/source/core/inc/frame.hxx |2
sw/source/core/inc/layfrm.hxx|4
sw/source/core/inc/rootfrm.hxx |2
sw/source/core/inc/sectfrm.hxx |2
sw/source/core/layout/newfrm.cxx |9
sw/source/core/layout/sectfrm.cxx| 13
sw/source/core/layout/ssfrm.cxx | 22 +
23 files changed, 501 insertions(+), 36 deletions(-)
New commits:
commit fa5e41067bc15c38dcc6c0c6fb327adad0444774
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 27 20:55:58 2012 +0100
add convwatch.py
diff --git a/bin/convwatch.py b/bin/convwatch.py
new file mode 100755
index 000..7880234
--- /dev/null
+++ b/bin/convwatch.py
@@ -0,0 +1,424 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+# 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 Red Hat, Inc., Michael Stahl mst...@redhat.com
+# (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.
+
+import getopt
+import os
+import subprocess
+import sys
+import time
+import uuid
+try:
+from urllib.parse import quote
+except ImportError:
+from urllib import quote
+
+try:
+import pyuno
+import uno
+import unohelper
+except ImportError:
+print(pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables)
+print(PYTHONPATH=/installation/opt/program)
+print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
+raise
+
+try:
+from com.sun.star.document import XDocumentEventListener
+except ImportError:
+print(UNO API class not found: try to set URE_BOOTSTRAP variable)
+print(URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc)
+raise
+
+### utilities ###
+
+def partition(list, pred):
+left = []
+right = []
+for e in list:
+if pred(e):
+left.append(e)
+else:
+right.append(e)
+return (left, right)
+
+def filelist(dir, suffix):
+if len(dir) == 0:
+raise Exception(filelist: empty directory)
+if not(dir[-1] == /):
+dir += /
+files = [dir + f for f in os.listdir(dir)]
+#print(files)
+return [f for f in files
+if os.path.isfile(f) and os.path.splitext(f)[1] == suffix]
+
+def getFiles(dirs, suffix):
+files = []
+for dir in dirs:
+files += filelist(dir, suffix)
+return files
+
+### UNO utilities ###
+
+class OfficeConnection:
+def __init__(self, args):
+self.args = args
+self.soffice = None
+self.socket = None
+self.xContext = None
+def setUp(self):
+(method, sep, rest) = self.args[--soffice].partition(:)
+if sep != ::
+raise Exception(soffice parameter does not specify method)
+if method == path:
+socket = pipe,name=pytest + str(uuid.uuid1())
+try:
+userdir = self.args[--userdir]
+except KeyError:
+raise Exception('path' method requires --userdir)
+if not(userdir.startswith(file://)):
+raise Exception(--userdir must be file URL)
+self.soffice =
[Libreoffice-commits] .: configure.in
configure.in |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 207dbaaf83a9955f0b02978551340080ddac10cc Author: Fernando Governatore affql...@gmail.com Date: Sat Feb 25 15:22:08 2012 -0200 fix icecc compile in ubuntu In ubuntu the GCC_HOME of icecc is in /usr/lib/icecc diff --git a/configure.in b/configure.in index fe35ab3..8271431 100644 --- a/configure.in +++ b/configure.in @@ -2167,7 +2167,11 @@ GCC_HOME_SET=true AC_MSG_CHECKING([gcc home]) if test -z $with_gcc_home; then if test $enable_icecream = yes ; then -GCC_HOME=/opt/icecream +if test -d /usr/lib/icecc/ ; then +GCC_HOME=/usr/lib/icecc/ +else +GCC_HOME=/opt/icecream/ +fi else GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` GCC_HOME_SET=false ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/appbas.cxx |4 1 file changed, 4 insertions(+) New commits: commit 3eff0e79154d73098f8b1ace1015bdb436f423a8 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 27 23:43:18 2012 +0200 Deduplication of aSfxInt16Item_Impl only for iOS diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 9943157..12ef3f0 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -88,7 +88,9 @@ #if defined(LIBO_MERGELIBS) || defined(IOS) /* Avoid clash with the ones from svx/source/form/typemap.cxx */ #define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl +#ifdef IOS #define aSfxInt16Item_Impl sfx2_source_appl_appbas_aSfxInt16Item_Impl +#endif #define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl #define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl #define aSfxUInt32Item_Impl sfx2_source_appl_appbas_aSfxUInt32Item_Impl @@ -101,7 +103,9 @@ #if defined(LIBO_MERGELIBS) || defined(IOS) #undef aSfxBoolItem_Impl +#ifdef IOS #undef aSfxInt16Item_Impl +#endif #undef aSfxStringItem_Impl #undef aSfxUInt16Item_Impl #undef aSfxUInt32Item_Impl ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - 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] Changes to 'feature/android'
New branch 'feature/android' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in writerperfect/Module_writerperfect.mk
configure.in |3 +++ writerperfect/Module_writerperfect.mk | 29 + 2 files changed, 32 insertions(+) New commits: commit 9fb0ad21f467f6e8960e3559337f8ebdfa206ff9 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 28 00:29:14 2012 +0200 writerperfect depends on libwp[dgs], libcdr and libvisio Don't try to build libraries that depend on libraries we don't have. diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 4b2faad..dc2039c 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -28,13 +28,42 @@ $(eval $(call gb_Module_Module,writerperfect)) +ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_cdrimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_msworks \ +)) +endif +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_visioimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpft \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpgimport \ +)) +endif + +ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,writerperfect,\ StaticLibrary_writerperfect \ )) +endif # vim: set noet sw=4 ts=4: commit 44f3a76e979575a642373f3e1fb2db31612c5485 Author: Tor Lillqvist t...@iki.fi Date: Mon Feb 27 19:48:23 2012 +0200 libvisio depends on the LGPL libwpd and libwpg so bypass on iOS then diff --git a/configure.in b/configure.in index 8271431..e6e1205 100644 --- a/configure.in +++ b/configure.in @@ -5748,6 +5748,9 @@ if test $with_system_libvisio = yes; then AC_MSG_RESULT([external]) SYSTEM_LIBVISIO=YES PKG_CHECK_MODULES( VISIO, libvisio-0.0 ) +elif test $_os = iOS; then +# libvisio depends on libwpd and libwpg and those are LGPL +AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_LIBVISIO=NO ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source sw/Library_swui.mk
svx/source/dialog/txencbox.cxx |8
sw/Library_swui.mk | 35 ---
2 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 0d55cc7bf4dc62a0a5029fc19d0f05e08b6dc110
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue Feb 21 22:44:21 2012 +0100
Some more work for --disable-database-connectivity
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 9a07c5f..9aa5736 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -30,7 +30,9 @@
#include svx/txencbox.hxx
#include svx/txenctab.hxx
#include svx/dialogs.hrc
+#ifndef DISABLE_DBCONNECTIVITY
#include svx/dbcharsethelper.hxx
+#endif
#include vcl/svapp.hxx
#include rtl/tencinfo.h
#include rtl/locale.h
@@ -124,6 +126,11 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
+#ifdef DISABLE_DBCONNECTIVITY
+(void)bExcludeImportSubsets;
+(void)nExcludeInfoFlags;
+(void)nButIncludeInfoFlags;
+#else
rtl_TextEncodingInfo aInfo;
aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
svxform::ODataAccessCharsetHelper aCSH;
@@ -171,6 +178,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
InsertTextEncoding( nEnc );
}
}
+#endif
}
//
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index fe1c254..c759aa0 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -85,21 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/config/optcomp \
sw/source/ui/config/optload \
sw/source/ui/config/optpage \
-sw/source/ui/dbui/addresslistdialog \
-sw/source/ui/dbui/createaddresslistdialog \
-sw/source/ui/dbui/customizeaddresslistdialog \
-sw/source/ui/dbui/dbinsdlg \
-sw/source/ui/dbui/dbtablepreviewdialog \
-sw/source/ui/dbui/mailmergewizard \
-sw/source/ui/dbui/mmaddressblockpage \
-sw/source/ui/dbui/mmdocselectpage \
-sw/source/ui/dbui/mmgreetingspage \
-sw/source/ui/dbui/mmlayoutpage \
-sw/source/ui/dbui/mmmergepage \
-sw/source/ui/dbui/mmoutputpage \
-sw/source/ui/dbui/mmoutputtypepage \
-sw/source/ui/dbui/mmpreparemergepage \
-sw/source/ui/dbui/selectdbtabledialog \
sw/source/ui/dialog/abstract \
sw/source/ui/dialog/addrdlg \
sw/source/ui/dialog/ascfldlg \
@@ -170,4 +155,24 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/utlui/swrenamexnameddlg \
))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Library_add_exception_objects,swui,\
+sw/source/ui/dbui/addresslistdialog \
+sw/source/ui/dbui/createaddresslistdialog \
+sw/source/ui/dbui/customizeaddresslistdialog \
+sw/source/ui/dbui/dbinsdlg \
+sw/source/ui/dbui/dbtablepreviewdialog \
+sw/source/ui/dbui/mailmergewizard \
+sw/source/ui/dbui/mmaddressblockpage \
+sw/source/ui/dbui/mmdocselectpage \
+sw/source/ui/dbui/mmgreetingspage \
+sw/source/ui/dbui/mmlayoutpage \
+sw/source/ui/dbui/mmmergepage \
+sw/source/ui/dbui/mmoutputpage \
+sw/source/ui/dbui/mmoutputtypepage \
+sw/source/ui/dbui/mmpreparemergepage \
+sw/source/ui/dbui/selectdbtabledialog \
+))
+endif
+
# 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] .: 2 commits - svtools/inc svtools/source tools/inc tools/source unusedcode.easy
svtools/inc/svtools/svlbox.hxx | 28 ---
svtools/inc/svtools/svtreebx.hxx |1
svtools/source/contnr/svlbox.cxx | 139 ---
tools/inc/tools/stream.hxx |1
tools/source/stream/strmunx.cxx | 11 ---
unusedcode.easy |3
6 files changed, 183 deletions(-)
New commits:
commit be76f5d701c9e229e31fb77b606358e7488020d0
Author: Marc-André Laverdière-Papineau marc-an...@atc.tcs.com
Date: Mon Feb 27 04:56:32 2012 -0500
Removed dead code
* Removed unused SvInplaceEdit
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 9fde1c6..b4f33c1 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -54,7 +54,6 @@ class SvLBox;
class SvLBoxEntry;
class SvViewDataItem;
class SvViewDataEntry;
-class SvInplaceEdit;
class SvInplaceEdit2;
class SvLBoxString;
class SvLBoxButton;
@@ -581,33 +580,6 @@ struct SvLBoxDDInfo
sal_uLong nRes1,nRes2,nRes3,nRes4;
};
-class SvInplaceEdit : public Edit
-{
-LinkaCallBackHdl;
-Accelerator aAccReturn;
-Accelerator aAccEscape;
-Timer aTimer;
-sal_BoolbCanceled;
-sal_BoolbAlreadyInCallBack;
-
-voidCallCallBackHdl_Impl();
-DECL_LINK( Timeout_Impl, Timer * );
-DECL_LINK( ReturnHdl_Impl, Accelerator * );
-DECL_LINK( EscapeHdl_Impl, Accelerator * );
-
-public:
-SvInplaceEdit( Window* pParent, const Point rPos, const Size rSize,
- const String rData, const Link rNotifyEditEnd,
- const Selection );
-~SvInplaceEdit();
-
-virtual voidKeyInput( const KeyEvent rKEvt );
-virtual voidLoseFocus();
-sal_BoolEditingCanceled() const { return bCanceled; }
-String GetText() const { return Edit::GetText(); }
-voidStopEditing( sal_Bool bCancel = sal_False );
-};
-
class SvInplaceEdit2
{
LinkaCallBackHdl;
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index eab00e7..0b45b05 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -36,7 +36,6 @@
// forward and defines ---
class SvImpLBox;
-class SvInplaceEdit;
class TabBar;
#define SV_TAB_BORDER 8
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 0809368..1ecfcf0 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -54,150 +54,11 @@ using namespace ::com::sun::star::accessibility;
static SvLBox* pDDSource = NULL;
static SvLBox* pDDTarget = NULL;
-DBG_NAME(SvInplaceEdit)
DBG_NAME(SvInplaceEdit2)
#define SVLBOX_ACC_RETURN 1
#define SVLBOX_ACC_ESCAPE 2
-SvInplaceEdit::SvInplaceEdit
-(
-Window* pParent,
-const PointrPos,
-const Size rSize,
-const String rData,
-const Link rNotifyEditEnd,
-const SelectionrSelection
-) :
-
-Edit( pParent, WB_LEFT ),
-
-aCallBackHdl( rNotifyEditEnd ),
-bCanceled ( sal_False ),
-bAlreadyInCallBack ( sal_False )
-
-{
-DBG_CTOR(SvInplaceEdit,0);
-
-Font aFont( pParent-GetFont() );
-aFont.SetTransparent( sal_False );
-Color aColor( pParent-GetBackground().GetColor() );
-aFont.SetFillColor(aColor );
-SetFont( aFont );
-SetBackground( pParent-GetBackground() );
-SetPosPixel( rPos );
-SetSizePixel( rSize );
-SetText( rData );
-SetSelection( rSelection );
-SaveValue();
-
-aAccReturn.InsertItem( SVLBOX_ACC_RETURN, KeyCode(KEY_RETURN) );
-aAccEscape.InsertItem( SVLBOX_ACC_ESCAPE, KeyCode(KEY_ESCAPE) );
-
-aAccReturn.SetActivateHdl( LINK( this, SvInplaceEdit, ReturnHdl_Impl) );
-aAccEscape.SetActivateHdl( LINK( this, SvInplaceEdit, EscapeHdl_Impl) );
-GetpApp()-InsertAccel( aAccReturn );
-GetpApp()-InsertAccel( aAccEscape );
-
-Show();
-GrabFocus();
-}
-
-SvInplaceEdit::~SvInplaceEdit()
-{
-DBG_DTOR(SvInplaceEdit,0);
-if( !bAlreadyInCallBack )
-{
-GetpApp()-RemoveAccel( aAccReturn );
-GetpApp()-RemoveAccel( aAccEscape );
-}
-}
-
-IMPL_LINK_INLINE_START( SvInplaceEdit, ReturnHdl_Impl, Accelerator *, EMPTYARG
)
-{
-DBG_CHKTHIS(SvInplaceEdit,0);
-bCanceled = sal_False;
-CallCallBackHdl_Impl();
-return 1;
-}
-IMPL_LINK_INLINE_END( SvInplaceEdit, ReturnHdl_Impl, Accelerator *, EMPTYARG )
-
-IMPL_LINK_INLINE_START( SvInplaceEdit, EscapeHdl_Impl, Accelerator *, EMPTYARG
)
-{
-DBG_CHKTHIS(SvInplaceEdit,0);
-bCanceled = sal_True;
-CallCallBackHdl_Impl();
-return 1;
-}
-IMPL_LINK_INLINE_END( SvInplaceEdit, EscapeHdl_Impl, Accelerator *, EMPTYARG )
-
-void SvInplaceEdit::KeyInput( const KeyEvent rKEvt )
-{
-DBG_CHKTHIS(SvInplaceEdit,0);
-sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
-switch ( nCode )
-{
-case
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sc/source
sc/source/filter/excel/xichart.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 0c78ff5de2ac1e10e68876ef586c0f2d9d5d626a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Feb 24 20:42:09 2012 +
fdo#40320: Insert only a placeholder since the caller relies on this
behavior.
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 7d5f7d9..e83b8d8 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2135,8 +2135,9 @@ XclImpChTextRef* XclImpChSeries::GetDataLabelRef(
sal_uInt16 nPointIdx )
XclImpChTextMap::iterator itr = maLabels.lower_bound(nPointIdx);
if (itr == maLabels.end() || maLabels.key_comp()(nPointIdx,
itr-first))
{
-// No object exists at this point index position. Insert a new
one.
-XclImpChTextRef p(new XclImpChText(GetChRoot()));
+// No object exists at this point index position. Insert a new
+// placeholder.
+XclImpChTextRef p;
itr = maLabels.insert(itr, XclImpChTextMap::value_type(nPointIdx,
p));
}
return itr-second;
commit 1f2cf45c6f423c3ad1e12307e8f02a5014a3b913
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Feb 24 19:44:43 2012 +
fdo#40320: Correctly import data point formats in data series.
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 8cf884d..7d5f7d9 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2118,8 +2118,9 @@ XclImpChDataFormatRef* XclImpChSeries::GetDataFormatRef(
sal_uInt16 nPointIdx )
XclImpChDataFormatMap::iterator itr =
maPointFmts.lower_bound(nPointIdx);
if (itr == maPointFmts.end() || maPointFmts.key_comp()(nPointIdx,
itr-first))
{
-// No object exists at this point index position. Insert a new
one.
-XclImpChDataFormatRef p(new XclImpChDataFormat(GetChRoot()));
+// No object exists at this point index position. Insert a new
+// placeholder.
+XclImpChDataFormatRef p;
itr = maPointFmts.insert(itr,
XclImpChDataFormatMap::value_type(nPointIdx, p));
}
return itr-second;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 106 --- src/xlsstream.py |2 - 2 files changed, 49 insertions(+), 59 deletions(-) New commits: commit 21b82dc9ca6c869699f4ab759361fe4b76b028c3 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Feb 27 22:00:52 2012 -0500 Re-did handler for SXVD record. SXVD record stores pivot table field data. diff --git a/src/xlsrecord.py b/src/xlsrecord.py index 4e7d99c..55ea471 100644 --- a/src/xlsrecord.py +++ b/src/xlsrecord.py @@ -3258,66 +3258,56 @@ class SXViewSource(BaseRecordHandler): self.appendLine(data source type: %s%srcType) -class SXViewFields(BaseRecordHandler): +class Sxvd(BaseRecordHandler): -def parseBytes (self): -axis = globals.getSignedInt(self.readBytes(2)) -subtotalCount = globals.getSignedInt(self.readBytes(2)) -subtotalType = globals.getSignedInt(self.readBytes(2)) -itemCount = globals.getSignedInt(self.readBytes(2)) -nameLen = globals.getSignedInt(self.readBytes(2)) - -axisType = 'unknown' -if axis == 0: -axisType = 'no axis' -elif axis == 1: -axisType = 'row' -elif axis == 2: -axisType = 'column' -elif axis == 4: -axisType = 'page' -elif axis == 8: -axisType = 'data' - -subtotalTypeName = 'unknown' -if subtotalType == 0x: -subtotalTypeName = 'None' -elif subtotalType == 0x0001: -subtotalTypeName = 'Default' -elif subtotalType == 0x0002: -subtotalTypeName = 'Sum' -elif subtotalType == 0x0004: -subtotalTypeName = 'CountA' -elif subtotalType == 0x0008: -subtotalTypeName = 'Average' -elif subtotalType == 0x0010: -subtotalTypeName = 'Max' -elif subtotalType == 0x0020: -subtotalTypeName = 'Min' -elif subtotalType == 0x0040: -subtotalTypeName = 'Product' -elif subtotalType == 0x0080: -subtotalTypeName = 'Count' -elif subtotalType == 0x0100: -subtotalTypeName = 'Stdev' -elif subtotalType == 0x0200: -subtotalTypeName = 'StdevP' -elif subtotalType == 0x0400: -subtotalTypeName = 'Var' -elif subtotalType == 0x0800: -subtotalTypeName = 'VarP' - -self.appendLine(axis type: %s%axisType) -self.appendLine(number of subtotals: %d%subtotalCount) -self.appendLine(subtotal type: %s%subtotalTypeName) -self.appendLine(number of items: %d%itemCount) - -if nameLen == -1: -self.appendLine(name: null (use name in the cache)) -else: -name, nameLen = globals.getRichText(self.readRemainingBytes(), nameLen) -self.appendLine(name: %s%name) +def __parseBytes (self): +flag = self.readUnsignedInt(2) +self.sxaxisRw = (flag 0x0001) != 0 +self.sxaxisCol = (flag 0x0002) != 0 +self.sxaxisPage = (flag 0x0004) != 0 +self.sxaxisData = (flag 0x0008) != 0 +self.cSub = self.readUnsignedInt(2) +flag = self.readUnsignedInt(2) +self.fDefault = (flag 0x0001) != 0 # A +self.fSum = (flag 0x0002) != 0 # B +self.fCounta= (flag 0x0004) != 0 # C +self.fAverage = (flag 0x0008) != 0 # D +self.fMax = (flag 0x0010) != 0 # E +self.fMin = (flag 0x0020) != 0 # F +self.fProduct = (flag 0x0040) != 0 # G +self.fCount = (flag 0x0080) != 0 # H +self.fStdev = (flag 0x0100) != 0 # I +self.fStdevp= (flag 0x0200) != 0 # J +self.fVariance = (flag 0x0400) != 0 # K +self.fVariancep = (flag 0x0800) != 0 # L +self.cItm = self.readSignedInt(2) +cchName = self.readUnsignedInt(2) +self.stName = '(null)' +if cchName != 0x: +self.stName = self.readXLUnicodeStringNoCch(cchName) +def parseBytes (self): +self.__parseBytes() +self.appendLine(axes type) +self.appendLineBoolean( row, self.sxaxisRw) +self.appendLineBoolean( column, self.sxaxisCol) +self.appendLineBoolean( page, self.sxaxisPage) +self.appendLineBoolean( data, self.sxaxisData) +self.appendLineInt(subtotal count, self.cSub) +self.appendLineBoolean( default, self.fDefault) +self.appendLineBoolean( sum, self.fSum) +self.appendLineBoolean( counta, self.fCounta) +self.appendLineBoolean( average, self.fAverage) +self.appendLineBoolean( max, self.fMax) +self.appendLineBoolean( min, self.fMin) +self.appendLineBoolean( product, self.fProduct) +self.appendLineBoolean( count, self.fCount) +self.appendLineBoolean( stdev, self.fStdev) +self.appendLineBoolean( stdevp, self.fStdevp) +
[Libreoffice-commits] .: src/xlsrecord.py
src/xlsrecord.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6451bece90617796590557490710dc63a79a4279 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Mon Feb 27 22:05:05 2012 -0500 Clarify what the number of pivot items means. diff --git a/src/xlsrecord.py b/src/xlsrecord.py index 55ea471..5526773 100644 --- a/src/xlsrecord.py +++ b/src/xlsrecord.py @@ -3306,7 +3306,7 @@ class Sxvd(BaseRecordHandler): self.appendLineBoolean( stdevp, self.fStdevp) self.appendLineBoolean( variance, self.fVariance) self.appendLineBoolean( variancep, self.fVariancep) -self.appendLineInt(number of pivot items, self.cItm) +self.appendLineInt(number of SXVI records that follow, self.cItm) self.appendLineString(caption, self.stName) class SXViewFieldsEx(BaseRecordHandler): ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/inc sc/source
sc/inc/dputil.hxx |3 +
sc/source/core/data/dpsave.cxx |6 +--
sc/source/filter/excel/xepivot.cxx |7 ++--
sc/source/filter/excel/xipivot.cxx | 62 ++---
4 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 0c47d6c85b3845e8cf9782583ee17909c38dcca2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 27 23:43:20 2012 -0500
Consolidate code that insert new dimensions.
To make it easier to keep track of who inserts new dimensions.
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index ec46604..15c377b 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -920,8 +920,7 @@ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const
::rtl::OUString rName
return NULL;
ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld );
-CheckDuplicateName(*pNew);
-aDimList.push_back(pNew);
+AddDimension(pNew);
return pNew;
}
@@ -942,8 +941,7 @@ void ScDPSaveData::RemoveDimensionByName(const
::rtl::OUString rName)
ScDPSaveDimension ScDPSaveData::DuplicateDimension( const ScDPSaveDimension
rDim )
{
ScDPSaveDimension* pNew = new ScDPSaveDimension( rDim );
-CheckDuplicateName(*pNew);
-aDimList.push_back(pNew);
+AddDimension(pNew);
return *pNew;
}
commit de6b91f57b0c5621791bea7b7f24de5b7b40e666
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Feb 27 23:41:11 2012 -0500
Correctly import ref type (aka display type) of data fields.
diff --git a/sc/source/filter/excel/xipivot.cxx
b/sc/source/filter/excel/xipivot.cxx
index 7284ba1..0aff093 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1037,23 +1037,23 @@ void XclImpPTField::ConvertDataField( ScDPSaveData
rSaveData ) const
{
OSL_ENSURE( maFieldInfo.mnAxes EXC_SXVD_AXIS_DATA,
XclImpPTField::ConvertDataField - no data field );
OSL_ENSURE( !maDataInfoList.empty(), XclImpPTField::ConvertDataField - no
data field info );
-if( !maDataInfoList.empty() )
-{
-const String rFieldName = GetFieldName();
-if( rFieldName.Len() 0 )
-{
-XclPTDataFieldInfoList::const_iterator aIt =
maDataInfoList.begin(), aEnd = maDataInfoList.end();
+if (maDataInfoList.empty())
+return;
+
+rtl::OUString aFieldName = GetFieldName();
+if (aFieldName.isEmpty())
+return;
-ScDPSaveDimension rSaveDim = *rSaveData.GetNewDimensionByName(
rFieldName );
-ConvertDataField( rSaveDim, *aIt );
+XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd
= maDataInfoList.end();
-// multiple data fields - clone dimension
-for( ++aIt; aIt != aEnd; ++aIt )
-{
-ScDPSaveDimension rDupDim = rSaveData.DuplicateDimension(
rSaveDim );
-ConvertDataFieldInfo( rDupDim, *aIt );
-}
-}
+ScDPSaveDimension rSaveDim = *rSaveData.GetNewDimensionByName(aFieldName);
+ConvertDataField( rSaveDim, *aIt );
+
+// multiple data fields - clone dimension
+for( ++aIt; aIt != aEnd; ++aIt )
+{
+ScDPSaveDimension rDupDim = rSaveData.DuplicateDimension( rSaveDim );
+ConvertDataFieldInfo( rDupDim, *aIt );
}
}
@@ -1163,31 +1163,31 @@ void XclImpPTField::ConvertDataField(
ScDPSaveDimension rSaveDim, const XclPTDa
void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension rSaveDim, const
XclPTDataFieldInfo rDataInfo ) const
{
// visible name
-if (const rtl::OUString* pVisName = rDataInfo.GetVisName())
-if (!pVisName-isEmpty())
-rSaveDim.SetLayoutName( *pVisName );
+const rtl::OUString* pVisName = rDataInfo.GetVisName();
+if (pVisName !pVisName-isEmpty())
+rSaveDim.SetLayoutName(*pVisName);
// aggregation function
rSaveDim.SetFunction( static_cast sal_uInt16 ( rDataInfo.GetApiAggFunc()
) );
// result field reference
sal_Int32 nRefType = rDataInfo.GetApiRefType();
-if( nRefType != ::com::sun::star::sheet::DataPilotFieldReferenceType::NONE
)
+DataPilotFieldReference aFieldRef;
+aFieldRef.ReferenceType = nRefType;
+const XclImpPTField* pRefField = mrPTable.GetField(rDataInfo.mnRefField);
+if (pRefField)
{
-DataPilotFieldReference aFieldRef;
-aFieldRef.ReferenceType = nRefType;
-
-if( const XclImpPTField* pRefField = mrPTable.GetField(
rDataInfo.mnRefField ) )
+aFieldRef.ReferenceField = pRefField-GetFieldName();
+aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType();
+if (aFieldRef.ReferenceItemType ==
sheet::DataPilotFieldReferenceItemType::NAMED)
{
-aFieldRef.ReferenceField = pRefField-GetFieldName();
-aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType();
-if( aFieldRef.ReferenceItemType ==
