[PATCH] OUString cleanup in accessibility
>From Ricardo Montania : Ricardo Montania has uploaded a new change for review. Change subject: OUString cleanup in accessibility .. OUString cleanup in accessibility Change-Id: Ie4e51632bf81053f0d32428bb7ef5b01ec301ccc --- M accessibility/source/extended/AccessibleBrowseBox.cxx M accessibility/source/extended/AccessibleBrowseBoxBase.cxx M accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx M accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx M accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx M accessibility/source/extended/AccessibleBrowseBoxTable.cxx M accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx M accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx M accessibility/source/extended/AccessibleGridControl.cxx M accessibility/source/extended/AccessibleGridControlBase.cxx M accessibility/source/extended/AccessibleGridControlHeader.cxx M accessibility/source/extended/AccessibleGridControlHeaderCell.cxx M accessibility/source/extended/AccessibleGridControlTable.cxx M accessibility/source/extended/AccessibleGridControlTableBase.cxx M accessibility/source/extended/AccessibleGridControlTableCell.cxx M accessibility/source/extended/AccessibleToolPanelDeck.cxx M accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx M accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx M accessibility/source/extended/accessiblebrowseboxcell.cxx M accessibility/source/extended/accessibleeditbrowseboxcell.cxx M accessibility/source/extended/accessibleiconchoicectrl.cxx M accessibility/source/extended/accessibleiconchoicectrlentry.cxx M accessibility/source/extended/accessiblelistbox.cxx M accessibility/source/extended/accessiblelistboxentry.cxx M accessibility/source/extended/accessibletabbar.cxx M accessibility/source/extended/accessibletabbarpage.cxx M accessibility/source/extended/accessibletabbarpagelist.cxx M accessibility/source/extended/accessibletablistboxtable.cxx M accessibility/source/extended/textwindowaccessibility.cxx M accessibility/source/helper/accresmgr.cxx M accessibility/source/helper/characterattributeshelper.cxx M accessibility/source/standard/accessiblemenubasecomponent.cxx M accessibility/source/standard/accessiblemenucomponent.cxx M accessibility/source/standard/accessiblemenuitemcomponent.cxx M accessibility/source/standard/vclxaccessiblebox.cxx M accessibility/source/standard/vclxaccessiblebutton.cxx M accessibility/source/standard/vclxaccessiblecheckbox.cxx M accessibility/source/standard/vclxaccessiblecombobox.cxx M accessibility/source/standard/vclxaccessibledropdowncombobox.cxx M accessibility/source/standard/vclxaccessibledropdownlistbox.cxx M accessibility/source/standard/vclxaccessibleedit.cxx M accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx M accessibility/source/standard/vclxaccessiblefixedtext.cxx M accessibility/source/standard/vclxaccessiblelist.cxx M accessibility/source/standard/vclxaccessiblelistbox.cxx M accessibility/source/standard/vclxaccessiblelistitem.cxx M accessibility/source/standard/vclxaccessiblemenu.cxx M accessibility/source/standard/vclxaccessiblemenubar.cxx M accessibility/source/standard/vclxaccessiblemenuitem.cxx M accessibility/source/standard/vclxaccessiblemenuseparator.cxx M accessibility/source/standard/vclxaccessiblepopupmenu.cxx M accessibility/source/standard/vclxaccessibleradiobutton.cxx M accessibility/source/standard/vclxaccessiblescrollbar.cxx M accessibility/source/standard/vclxaccessiblestatusbar.cxx M accessibility/source/standard/vclxaccessiblestatusbaritem.cxx M accessibility/source/standard/vclxaccessibletabcontrol.cxx M accessibility/source/standard/vclxaccessibletabpage.cxx M accessibility/source/standard/vclxaccessibletextfield.cxx M accessibility/source/standard/vclxaccessibletoolbox.cxx M accessibility/source/standard/vclxaccessibletoolboxitem.cxx 60 files changed, 559 insertions(+), 605 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/579/1 -- To view, visit https://gerrit.libreoffice.org/579 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4e51632bf81053f0d32428bb7ef5b01ec301ccc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/inc l10ntools/source
l10ntools/inc/gsicheck.hxx| 26 --
l10ntools/source/gsicheck.cxx | 11 +++
l10ntools/source/gsimain.cxx | 19 +++
3 files changed, 30 insertions(+), 26 deletions(-)
New commits:
commit 76e0a9a9d9ca5e5ea9df04baa8326688afd1336d
Author: Stephan Bergmann
Date: Fri Sep 7 07:36:38 2012 +0200
-Werror,-Wunused-function
Change-Id: I6736d1295a662527e2bfd12cfbebc0ef4634b397
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 266ea96..a33796c 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -163,34 +163,8 @@ public:
void LazyOpen();
};
-namespace {
-
sal_Int32 const MAX_GID_LID_LEN = 250;
-rtl::OString copyUpTo(
-rtl::OString const & text, sal_Int32 start, sal_Int32 maximumLength)
-{
-assert(start >= 0 && start <= text.getLength());
-return text.copy(start, std::min(text.getLength() - start, maximumLength));
-}
-
-rtl::OString addSuffix(
-rtl::OString const & pathname, rtl::OString const & suffix)
-{
-sal_Int32 n = pathname.lastIndexOf('.');
-if (n == -1) {
-fprintf(
-stderr,
-("Error: pathname \"%s\" does not contain dot to add suffix in"
- " front of\n"),
-pathname.getStr());
-exit(EXIT_FAILURE);
-}
-return pathname.replaceAt(n, 0, suffix);
-}
-
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 3a4c0af..082f9ef 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -42,6 +42,17 @@
#include "tagtest.hxx"
#include "gsicheck.hxx"
+namespace {
+
+rtl::OString copyUpTo(
+rtl::OString const & text, sal_Int32 start, sal_Int32 maximumLength)
+{
+assert(start >= 0 && start <= text.getLength());
+return text.copy(start, std::min(text.getLength() - start, maximumLength));
+}
+
+}
+
/*/
void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg,
rtl::OString const & aPrefix,
rtl::OString const & aContext, sal_Bool bPrintContext,
std::size_t nLine, rtl::OString aUniqueId )
diff --git a/l10ntools/source/gsimain.cxx b/l10ntools/source/gsimain.cxx
index 4ed9d69..7558731 100644
--- a/l10ntools/source/gsimain.cxx
+++ b/l10ntools/source/gsimain.cxx
@@ -42,6 +42,25 @@
#include "tagtest.hxx"
#include "gsicheck.hxx"
+namespace {
+
+rtl::OString addSuffix(
+rtl::OString const & pathname, rtl::OString const & suffix)
+{
+sal_Int32 n = pathname.lastIndexOf('.');
+if (n == -1) {
+fprintf(
+stderr,
+("Error: pathname \"%s\" does not contain dot to add suffix in"
+ " front of\n"),
+pathname.getStr());
+exit(EXIT_FAILURE);
+}
+return pathname.replaceAt(n, 0, suffix);
+}
+
+}
+
void Help()
{
fprintf( stdout, "\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/orcus-integration' - configure.in
configure.in |1 + 1 file changed, 1 insertion(+) New commits: commit e606059b98186e1c34c7465c83bcce8a4635b41f Author: Kohei Yoshida Date: Fri Sep 7 00:27:08 2012 -0400 I forgot this. Change-Id: Idabfb29b653982008bb5d4159458894f53cbf6f4 diff --git a/configure.in b/configure.in index 5762971..d1c3d28 100644 --- a/configure.in +++ b/configure.in @@ -8599,6 +8599,7 @@ else SYSTEM_LIBORCUS=NO fi AC_SUBST(SYSTEM_LIBORCUS) +AC_SUBST(ORCUS_TARBALL) AC_SUBST(LIBORCUS_CFLAGS) AC_SUBST(LIBORCUS_LIBS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/orcus-integration' - configure.in ooo.lst.in
configure.in |1 + ooo.lst.in |1 + 2 files changed, 2 insertions(+) New commits: commit 9a3c7da26b740e4f47428fe78ef0bdfd46f21c76 Author: Kohei Yoshida Date: Fri Sep 7 00:22:17 2012 -0400 Set orcus package tarball location for download. Change-Id: Iccdb2e53ad6a62d3ee96d368b897d47ee77fdc12 diff --git a/configure.in b/configure.in index 77d0ee6..5762971 100644 --- a/configure.in +++ b/configure.in @@ -8594,6 +8594,7 @@ if test "$with_system_orcus" = "yes"; then PKG_CHECK_MODULES(ORCUS, orcus >= 0.1.0) else AC_MSG_RESULT([internal]) +ORCUS_TARBALL=46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 BUILD_TYPE="$BUILD_TYPE LIBORCUS" SYSTEM_LIBORCUS=NO fi diff --git a/ooo.lst.in b/ooo.lst.in index 367b829..416968e 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -99,6 +99,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@ +@ORCUS_TARBALL@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll http://ooo.itc.hu/oxygenoffice/download/libreoffice/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/orcus-integration' - liborcus/makefile.mk
liborcus/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce0d1879e475419be55e683167969b9ecca6 Author: Kohei Yoshida Date: Fri Sep 7 00:06:12 2012 -0400 Final 0.1.0 package md5sum. Change-Id: I6738fd748817dfb2441c580ea2928b81a77d7aed diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk index de34e64..b108fce 100644 --- a/liborcus/makefile.mk +++ b/liborcus/makefile.mk @@ -33,7 +33,7 @@ TARGET=orcus .ENDIF TARFILE_NAME=liborcus_0.1.0 -TARFILE_MD5=aa346e934019d412ea6905563225f3cb +TARFILE_MD5=46d9f4cf8b145c21ce1056e116d2ce71 PATCH_FILES= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] OUString cleanup in vbahelper/msforms
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: OUString cleanup in vbahelper/msforms .. OUString cleanup in vbahelper/msforms Change-Id: I834c5f1f26f941a5db84b677f34ffa686e0c2544 --- M vbahelper/source/msforms/vbabutton.cxx M vbahelper/source/msforms/vbabutton.hxx M vbahelper/source/msforms/vbacheckbox.cxx M vbahelper/source/msforms/vbacheckbox.hxx M vbahelper/source/msforms/vbacombobox.cxx M vbahelper/source/msforms/vbacombobox.hxx M vbahelper/source/msforms/vbacontrol.cxx M vbahelper/source/msforms/vbacontrol.hxx M vbahelper/source/msforms/vbacontrols.cxx M vbahelper/source/msforms/vbaframe.cxx M vbahelper/source/msforms/vbaframe.hxx M vbahelper/source/msforms/vbaimage.cxx M vbahelper/source/msforms/vbaimage.hxx M vbahelper/source/msforms/vbalabel.cxx M vbahelper/source/msforms/vbalabel.hxx M vbahelper/source/msforms/vbalistbox.cxx M vbahelper/source/msforms/vbalistbox.hxx M vbahelper/source/msforms/vbalistcontrolhelper.cxx M vbahelper/source/msforms/vbalistcontrolhelper.hxx M vbahelper/source/msforms/vbamultipage.cxx M vbahelper/source/msforms/vbamultipage.hxx M vbahelper/source/msforms/vbanewfont.cxx M vbahelper/source/msforms/vbanewfont.hxx M vbahelper/source/msforms/vbapages.cxx M vbahelper/source/msforms/vbapages.hxx M vbahelper/source/msforms/vbaprogressbar.cxx M vbahelper/source/msforms/vbaprogressbar.hxx M vbahelper/source/msforms/vbaradiobutton.cxx M vbahelper/source/msforms/vbaradiobutton.hxx M vbahelper/source/msforms/vbascrollbar.cxx M vbahelper/source/msforms/vbascrollbar.hxx M vbahelper/source/msforms/vbaspinbutton.cxx M vbahelper/source/msforms/vbaspinbutton.hxx M vbahelper/source/msforms/vbasystemaxcontrol.cxx M vbahelper/source/msforms/vbasystemaxcontrol.hxx M vbahelper/source/msforms/vbatextbox.cxx M vbahelper/source/msforms/vbatogglebutton.cxx M vbahelper/source/msforms/vbatogglebutton.hxx M vbahelper/source/msforms/vbauserform.cxx M vbahelper/source/msforms/vbauserform.hxx 40 files changed, 429 insertions(+), 465 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/578/1 -- To view, visit https://gerrit.libreoffice.org/578 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I834c5f1f26f941a5db84b677f34ffa686e0c2544 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/orcus-integration' - framework/source
framework/source/loadenv/loadenv.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit a2a0fbf5f4da2a4a007e3bcd148ec09a5fa0c761
Author: Kohei Yoshida
Date: Thu Sep 6 22:21:12 2012 -0400
Disable the experimental orcus-based csv filter for now.
Change-Id: Iba8b36aaa19bbf2a9cb632fb6fe586b27ae27a7a
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index a4c042a..1b6c35a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -718,6 +718,13 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
::rtl::OUString&
namespace {
+#if 1
+bool queryOrcusTypeAndFilter(const uno::Sequence&,
OUString&, OUString&)
+{
+return false;
+}
+#else
+// TODO: We will reinstate this function later, so don't remove this!
bool queryOrcusTypeAndFilter(const uno::Sequence&
rDescriptor, OUString& rType, OUString& rFilter)
{
OUString aURL;
@@ -745,6 +752,7 @@ bool queryOrcusTypeAndFilter(const
uno::Sequence& rDescrip
return false;
}
+#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] More OUString cleanup in vbahelper
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: More OUString cleanup in vbahelper .. More OUString cleanup in vbahelper Change-Id: Ie9c650da762e9d5afea9018dd2c6496fcd14ca6f --- M vbahelper/source/vbahelper/vbaapplicationbase.cxx M vbahelper/source/vbahelper/vbacolorformat.cxx M vbahelper/source/vbahelper/vbacolorformat.hxx M vbahelper/source/vbahelper/vbacommandbar.cxx M vbahelper/source/vbahelper/vbacommandbar.hxx M vbahelper/source/vbahelper/vbacommandbarcontrol.cxx M vbahelper/source/vbahelper/vbacommandbarcontrol.hxx M vbahelper/source/vbahelper/vbacommandbarcontrols.cxx M vbahelper/source/vbahelper/vbacommandbarcontrols.hxx M vbahelper/source/vbahelper/vbacommandbarhelper.cxx M vbahelper/source/vbahelper/vbacommandbarhelper.hxx M vbahelper/source/vbahelper/vbacommandbars.hxx M vbahelper/source/vbahelper/vbadocumentsbase.cxx M vbahelper/source/vbahelper/vbafillformat.cxx M vbahelper/source/vbahelper/vbafillformat.hxx M vbahelper/source/vbahelper/vbaglobalbase.cxx M vbahelper/source/vbahelper/vbahelper.cxx M vbahelper/source/vbahelper/vbalineformat.cxx M vbahelper/source/vbahelper/vbalineformat.hxx M vbahelper/source/vbahelper/vbapictureformat.cxx M vbahelper/source/vbahelper/vbapictureformat.hxx M vbahelper/source/vbahelper/vbashape.cxx M vbahelper/source/vbahelper/vbashaperange.cxx M vbahelper/source/vbahelper/vbatextframe.cxx 24 files changed, 456 insertions(+), 467 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/577/1 -- To view, visit https://gerrit.libreoffice.org/577 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9c650da762e9d5afea9018dd2c6496fcd14ca6f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - basic/CppunitTest_basic_nested_struct.mk basic/inc basic/source
basic/CppunitTest_basic_nested_struct.mk | 11 +++ basic/inc/basic/basmgr.hxx |6 +++--- basic/inc/basic/basrdll.hxx |8 basic/inc/basic/sbmod.hxx|2 +- basic/inc/basic/sbstar.hxx |6 +++--- basic/inc/basic/sbstdobj.hxx |3 --- basic/inc/basic/sbxfac.hxx |6 +++--- basic/source/basmgr/basmgr.cxx |4 ++-- basic/source/classes/eventatt.cxx|2 +- basic/source/classes/image.cxx |4 ++-- basic/source/classes/sb.cxx |2 +- basic/source/classes/sbunoobj.cxx|8 basic/source/classes/sbxmod.cxx |6 +++--- basic/source/runtime/basrdll.cxx | 10 +- 14 files changed, 43 insertions(+), 35 deletions(-) New commits: commit b5afbbd8afb1e4f2ba21c2ff2032a4d1b466bff3 Author: Takeshi Abe Date: Fri Sep 7 05:03:13 2012 +0900 Bin useless includes Change-Id: I08a58468a3ce75038b65a8d9641cc2138541a7f5 diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx index c9befbe..cd04364 100644 --- a/basic/inc/basic/sbstdobj.hxx +++ b/basic/inc/basic/sbstdobj.hxx @@ -25,9 +25,6 @@ #include #include "basicdllapi.h" -class StarBASIC; -class SbStdFactory; - // // class SbStdFactory // commit 00b7328732f560b3c8517f0125e22b6ce6064c09 Author: Takeshi Abe Date: Fri Sep 7 04:59:11 2012 +0900 sal_Bool to bool Change-Id: Ie8a128db35bebcdcee5eda984a7875339418d9bb diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index a52771e..69ddb8e 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -124,7 +124,7 @@ private: String aName; String maStorageName; -sal_BoolmbDocMgr; +boolmbDocMgr; BasicManagerImpl* mpImpl; @@ -146,8 +146,8 @@ protected: public: TYPEINFO(); -BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False ); -BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False ); +BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, bool bDocMgr = false ); +BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, bool bDocMgr = false ); /** deletes the given BasicManager instance diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx index 3e920e6..20edde6 100644 --- a/basic/inc/basic/basrdll.hxx +++ b/basic/inc/basic/basrdll.hxx @@ -30,8 +30,8 @@ class BASIC_DLLPUBLIC BasicDLL private: ResMgr* pBasResMgr; -sal_BoolbDebugMode; -sal_BoolbBreakEnabled; +boolbDebugMode; +boolbBreakEnabled; public: BasicDLL(); @@ -41,8 +41,8 @@ public: static void BasicBreak(); -static void EnableBreak( sal_Bool bEnable ); -static void SetDebugMode( sal_Bool bDebugMode ); +static void EnableBreak( bool bEnable ); +static void SetDebugMode( bool bDebugMode ); }; #define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) ) diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index e654c53..ea9fff5 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -80,7 +80,7 @@ protected: voidRunInit(); voidClearPrivateVars(); voidClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic ); -voidGlobalRunInit( sal_Bool bBasicStart ); // for all modules +voidGlobalRunInit( bool bBasicStart ); // for all modules voidGlobalRunDeInit( void ); const sal_uInt8*FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const; const sal_uInt8*FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&, diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index 68765f4..e40583a 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -62,7 +62,7 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject LinkaBreakHdl; // Breakpoint handler sal_BoolbNoRtl; // if sal_True: do not search RTL sal_BoolbBreak; // if sal_True: Break, otherwise Step -sal_BoolbDocBasic; +boolbDocBasic; sal_BoolbVBAEnabled; BasicLibInfo* pLibInfo; // Info block for basic manager sal_BoolbQuit; @@ -93,7 +93,7 @@ public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1); TYPEINFO(); -StarBASIC( StarBASIC* pParent = NULL, sal_Bool bIsDocBasic = sal_False ); +S
[Libreoffice-commits] Changes to 'feature/orcus-integration'
New branch 'feature/orcus-integration' available with the following commits: commit aaf7e721ba5a6e376242971faad8f4f5a9b595e0 Author: Kohei Yoshida Date: Thu Sep 6 19:56:41 2012 -0400 Fix the windows build again, with new package. Change-Id: I4c2a480cc4a818c0b7ac5f0ad71826327d661eac commit 6901ccfb7fb16d7943a2f72e98e90a292b5d6539 Author: Kohei Yoshida Date: Thu Sep 6 15:10:19 2012 -0400 Make boostthread windows only for now. Not sure if unix needs it since most folks build with system boost there. Change-Id: I49d02a682e6658f6e3c5a6ada480903567d8c436 commit b4ad41bb5606a9a8770f0be951a43f5374e2af67 Author: Kohei Yoshida Date: Thu Sep 6 13:57:22 2012 -0400 Resurrect boost thread lib. Orcus needs it. Change-Id: Iadb4a223e4db523b50ee85b9079a7a4ba5971fd0 commit 78bb8e7320a13885dbfb6fe11fb518ae26327093 Author: Matúš Kukan Date: Thu Sep 6 19:08:33 2012 +0200 boost: create also libboost_date_time-vc90-mt-1_44.lib Change-Id: I1e48b478a42d2b554e165922b08354b971f971b9 commit e7b41f27866d2a2ad2e0eb5281446a6ba48227fe Author: Kohei Yoshida Date: Wed Sep 5 13:57:23 2012 -0400 Updated the liborcus package. Change-Id: Ie8f581401dfb144fda1673597ed6717b15b03e71 commit fa1746583bfabf61e1ea2c9767b5d9bee832ff16 Author: Kohei Yoshida Date: Wed Sep 5 00:22:33 2012 -0400 Use DOS style file path on Windows. Change-Id: Iefd223eb0df5809ae7123a2bdf4111477e6bd71d commit 3322345db012fc4933e00b95e7e85090f931542f Author: Kohei Yoshida Date: Tue Sep 4 16:18:26 2012 -0400 Adopted the Linux build. Change-Id: I32c8e02b5568345906e8af1168f34ab0fb093052 commit cf0a2da6eec68c7c69a421851ab01791c71ea2d7 Author: Kohei Yoshida Date: Tue Sep 4 15:05:35 2012 -0400 Get it to build on Windows, with MSVC compiler. Took me 3 days just to get it to work... Change-Id: Ie28dc9b4ddb967a547cad33da18911b77bb9d558 commit 539a891c5e91de887a2e6b60c03c526c77f5fef9 Author: Kohei Yoshida Date: Fri Aug 31 12:13:46 2012 -0400 Make it more generic. Change-Id: I3d3ddec1a8313bb58f5ae6bbc3edc1f273e25f94 commit 6a6f82dec1222addf2a70e0df8dff5e4b5e97ab4 Author: Kohei Yoshida Date: Fri Aug 31 12:06:52 2012 -0400 I'll agree with the comment, and remove this line. Change-Id: Ieff30d8df8128488910b75603d2499102b529c3b commit 2908ed17ad012b175d3c3f73243fd0ecdc52ba22 Author: Kohei Yoshida Date: Fri Aug 31 11:23:16 2012 -0400 We don't need this special orcus directory now that orcus is integrated. Change-Id: I3a9ef8ca998ad53969bd0911091a1c234e0b227e commit 6cb787c1f5a9222b94471d0723b392779969af32 Author: Kohei Yoshida Date: Fri Aug 31 11:14:50 2012 -0400 Use the latest license header. Change-Id: I6cd50b8707331b9cf41cb1d42b5ad3d167006478 commit 07bd5f000aa20f2a79d95b9c4701b5c660a681ab Author: Kohei Yoshida Date: Fri Aug 31 11:13:25 2012 -0400 Add or update the header guards. Change-Id: I1d2205e4659041670b1e3f0dc1dc41262e75c9ac commit 8d2de8631a04d03413384178c56854d68ded41e8 Author: Kohei Yoshida Date: Fri Aug 31 11:11:00 2012 -0400 Move the orcus handling code from sc to scfilt. Then this will be subject to on-demand loading. Change-Id: Ibefcb77b4c8a97707f3ea177a81bd61bdc58fc31 commit 39e06270ed32ee613c8e40d57637095ab4cb9fe8 Author: Kohei Yoshida Date: Fri Aug 31 10:11:32 2012 -0400 Let's use static archive instead of shared object for liborcus. Change-Id: I5e33dac1025b1b3e5f49baf67c80da37d8e2ca5d commit dcef3933a28d690f66014c0caebf51aae8b250c4 Author: Kohei Yoshida Date: Fri Aug 31 09:40:12 2012 -0400 Updated the package, to reduce the size from 2.5M to 304K. Debug symbols were included. Removed that. Change-Id: Ie8190f69fe9e04be591d41b76ad93611d5553f55 commit 2bfde012669c1ef33846b807a25765586ec2345a Author: Kohei Yoshida Date: Thu Aug 30 23:26:59 2012 -0400 Get internal liborcus to build. Change-Id: Ie08f8b608c5b71e5375793e6cf9054ea75d7732d commit b8caa94ea7840fcf4647fc81f61880c9dffcc9a4 Author: Kohei Yoshida Date: Fri Jul 27 22:14:39 2012 -0400 First cut on integrating liborcus into libreoffice tree It introduces the 'FilterProvider' property in the media descriptor to optionally bypass the normal loading process and let the external filter provider to handle the loading. For now I'm overwriting the csv import filter just to see how this could work just as an experiment. Orcus still needs a lot of work, and it crashes very often at the moment. Change-Id: I11b34572c71073144804a7d0dd5176c8067d8deb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/orcus-integration' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ccache for windows
Le Thu, 06 Sep 2012 09:44:28 +0200, Jan Holesovsky a écrit: Hi Mat, Mat M píše v St 05. 09. 2012 v 23:25 +0200: But is it normal that ccache on 3.6 branch only uses 3Gb ? I find it very low, compared to all binary files produced. Could someone on linux give its ccache stats to compare ? Kendy, what's your opinion ? I think the best would be to check the content of your ccache dir, and see if there are new files appearing there. You can also look at the content of the new files, if they look ~reasonably - IIRC I cache even the stdout/stderr for the dependency output. I don't have any starts at hand at the moment, but should you need any more details, please let me know :-) I think we can close this. I thought it should be higher because I remembered someone talking about 32 Gb needed, but I think now it was because of debug builds & history. So my 3Gb are fine and big enough, that's ok. I don't know if it is related, but workdir is 4,4 Gb for a standard windows build Thank you all for your answers -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] More OUString cleanup in vbahelper
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: More OUString cleanup in vbahelper .. More OUString cleanup in vbahelper Change-Id: Ibf1661c612486a3d5259d0e78dd03294d5eeef76 --- M vbahelper/inc/vbahelper/vbahelperinterface.hxx M vbahelper/source/vbahelper/vbacommandbars.cxx M vbahelper/source/vbahelper/vbadialogbase.cxx M vbahelper/source/vbahelper/vbadocumentbase.cxx M vbahelper/source/vbahelper/vbaeventshelperbase.cxx M vbahelper/source/vbahelper/vbafontbase.cxx 6 files changed, 74 insertions(+), 81 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/576/1 -- To view, visit https://gerrit.libreoffice.org/576 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf1661c612486a3d5259d0e78dd03294d5eeef76 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Some OUString cleanup in vbahelper
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: Some OUString cleanup in vbahelper .. Some OUString cleanup in vbahelper and RTL_CONSTASCII_USTRINGPARAM removal Change-Id: Ibc1411805fcf0a75ea9f660fd9ee8f5fdcda6b1d --- M vbahelper/source/vbahelper/vbashapes.cxx M vbahelper/source/vbahelper/vbawindowbase.cxx 2 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/574/1 -- To view, visit https://gerrit.libreoffice.org/574 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc1411805fcf0a75ea9f660fd9ee8f5fdcda6b1d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] More OUString cleanup in vbahelper
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: More OUString cleanup in vbahelper .. More OUString cleanup in vbahelper Change-Id: Ie7e350698900f1c1cacb6ebc3fa6716ef03ab782 --- M vbahelper/source/vbahelper/vbaglobalbase.cxx M vbahelper/source/vbahelper/vbapagesetupbase.cxx 2 files changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/575/1 -- To view, visit https://gerrit.libreoffice.org/575 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7e350698900f1c1cacb6ebc3fa6716ef03ab782 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/calcmove.cxx | 47 ++---
sw/source/core/layout/flylay.cxx | 14 +--
sw/source/core/layout/newfrm.cxx |3 +-
3 files changed, 33 insertions(+), 31 deletions(-)
New commits:
commit 3ee906137f6dc658d882cb0c34e9c1b2ce2f2b31
Author: Michael Stahl
Date: Thu Sep 6 23:34:57 2012 +0200
sw: tweak comment translations
c589da46 d71b97c1 b4aa7d03 414848b2 561c30b3
Change-Id: I364af06741f0400e25901bb7a4faccf674f991b7
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 70aafc0..ec72b37 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -85,16 +85,16 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm
*pNewUpper, sal_Bool, sal_Bool
// The most common case is the following: The Frm wants to float to
// somewhere where the FixSize is the same that the Frm itself has
already.
// In that case it's pretty easy to check if the Frm has enough space
-// for it's VarSize. If this is NOT the case, we already know that
+// for its VarSize. If this is NOT the case, we already know that
// we don't need to move.
// The Frm checks itself whether it has enough space - respecting the
fact
-// that it could probably split itself if needed.
-// If, however, the FixSize differs from the Frm or there are Flys
involved
-// (either in the old or the new position), we don't need to check
anything,
+// that it could possibly split itself if needed.
+// If, however, the FixSize differs from the Frm or Flys are involved
+// (either in the old or the new position), checking is pointless,
// and we have to move the Frm just to see what happens - if there's
// some space available to do it, that is.
-// The FixSize of the surroundings of Cntnts is always the width.
+// The FixSize of the containers of Cntnts is always the width.
// If we moved more than one sheet back (for example jumping over empty
// pages), we have to move either way. Otherwise, if the Frm doesn't
fit
@@ -124,9 +124,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm
*pNewUpper, sal_Bool, sal_Bool
SWRECTFNX( pNewUpper )
if( Abs( (pNewUpper->Prt().*fnRectX->fnGetWidth)() -
(GetUpper()->Prt().*fnRect->fnGetWidth)() ) > 1 ) {
-// In this case, only a _WouldFit with relocating is possible
-// TODO after translating the comment: what did the original
german "umhaengen"
-// mean? What does actually make sense in context of the code
here?
+// In this case, only a _WouldFit with test move is possible
nMoveAnyway = 2;
}
@@ -193,16 +191,18 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm
*pNewUpper, sal_Bool, sal_Bool
{
if ( nSpace )
{
-// Not respecting footnotes which are stuck to the
paragraph:
-// This would require extremely confusing code, regarding
the widths
+// Do not notify footnotes which are stuck to the
paragraph:
+// This would require extremely confusing code, taking into
+// account the widths
// and Flys, that in turn influence the footnotes, ...
-// _WouldFit can only be used if the width is the same and
ONLY
-// with self-anchored Flys.
+// _WouldFit can only be used if the width is the same and
+// ONLY self-anchored Flys are present.
-// _WouldFit can also be used if ONLY Flys anchored
somewhere else are present.
-// In this case, the width doesn't even matter, because
we're running a TestFormat
-// in the new surrounding.
+// _WouldFit can also be used if ONLY Flys anchored
+// somewhere else are present.
+// In this case, the width doesn't even matter,
+// because we're running a TestFormat in the new upper.
const sal_uInt8 nBwdMoveNecessaryResult =
BwdMoveNecessary( pNewPage, aRect);
const bool bObjsInNewUpper( nBwdMoveNecessaryResult == 2 ||
@@ -489,7 +489,7 @@ void SwFrm::PrepareCrsr()
|*
|*/
-// Here we return GetPrev(); however we will overlook empty SectionFrms
+// Here we return GetPrev(); however we will ignore empty SectionFrms
SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True )
{
SwFrm* pRet = pFrm->GetPrev();
@@ -993,7 +993,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs
&rAttrs )
ViewShell *pSh = g
[PATCH] Correct OUString check with proper startsWith()
>From Olivier Hallot : Olivier Hallot has uploaded a new change for review. Change subject: Correct OUString check with proper startsWith() .. Correct OUString check with proper startsWith() This patch fixes an error introduced in c75af8578d921040e1baf8414edd7239969bcd45, with OUString::startsWith() introduced by Lubos Lunak in 095ffaf5efef5e8fdc4d7dfa8cd90fff7b768661 Thanks to Lubos and Kendy. Change-Id: Idcfb9ef59cfdf4c7b08193f5c137b985fa8b9965 --- M xmlscript/source/xml_helper/xml_impctx.cxx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/573/1 -- To view, visit https://gerrit.libreoffice.org/573 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcfb9ef59cfdf4c7b08193f5c137b985fa8b9965 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: .: vcl/inc
this didn't fix the mac tinderbox like i hoped; on further investigation
it looks like the psp::PrintFontManager that is used in the newfangled
embedded font support is actually UNX-specific and not built on Win/Mac
platforms.
i don't know what to do about that...
On 06/09/12 20:49, Libreoffice Gerrit user wrote:
> vcl/inc/vcl/fontmanager.hxx |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> New commits:
> commit 23cd24bd4d4df9247f8f0496f9934a2ce6d110dd
> Author: Michael Stahl
> Date: Thu Sep 6 20:45:49 2012 +0200
>
> vcl: export PrintFontManager
>
> PrintFontManager is accessed from sw since
> 11f7d6aca36b25fb0b225cd0c641cd4f09338672
>
> Change-Id: Ia8124acfa15386b126af2133830e1803bcf1a70f
>
> diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
> index 81b4200..b659435 100644
> --- a/vcl/inc/vcl/fontmanager.hxx
> +++ b/vcl/inc/vcl/fontmanager.hxx
> @@ -153,7 +153,7 @@ class FontCache;
>
> class FontCache;
>
> -class VCL_PLUGIN_PUBLIC PrintFontManager
> +class VCL_DLLPUBLIC PrintFontManager
> {
> struct PrintFont;
> struct TrueTypeFontFile;
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regression in isHidden-Property of Frames
Hi Andor, On Wed, 2012-08-29 at 12:50 +, Andor E wrote: > We're currently in the process of switching from OpenOffice.org 3.2.1 > to LibreOffice. As a part of this, we're testing our extension WollMux > (www.wollmux.org) with LO. Great news :-) > During these tests we found a change in the behaviour of the > isHidden-Property of frames. That's annoying, sorry about that. > We're using a com.sun.star.document.XEventListener to listen to the > onViewCreated-Event. We then test, if the document is visible, and > only then WollMux will process the document. > In OOo 3.2.1 a new document created with File/New would have isHidden > == false. In LO the document now returns isHidden == true. Odd indeed. Can you be more specific ? > I have searched in the sources of LO and found a change in > ./framework/source/services/frame.cxx. This was introduced with the > commit74ffe76476d5b8941454a2acce569737237fc1d7. Interesting; that's a change we inherited around Frank's autorecovery re-write. > I believe that this change is wrong and should be reverted. Before the > change isHidden represented the intended state of a frame. A document > that was openened hidden, returned hidden. A document opened visible > returned not hidden. Now it will always return isHidden == true. If > this isn't changed back, there needs to be another property to check > the intended visibilty. Interesting - it merits deeper investigation - thanks so much for getting down to the commit that caused the issue. I suppose it's necessary to poke with and read the auto-recovery code to see why that was done. Adding a new property on the frame to return a more helpful setting is certainly possible; I wonder if that is already there via some other interface. I suspect that if you use: virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow (); on the XFrame interface - then you have an XWindow interface to the top-level window on which you can interrogate a visibility property of some sort something like: awt::XWindow xFoo = xFrame->getContainerWindow(); bool bVisible = xFoo->isVisible(); Of course perhaps that is not what you want ? :-) but if you want to see if the window is actually visible on the screen, that -might- do what you want (untested but sniffing around there might help). HTH, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/Executable_gsicheck.mk l10ntools/inc l10ntools/source l10ntools/StaticLibrary_transex.mk
l10ntools/Executable_gsicheck.mk |6
l10ntools/StaticLibrary_transex.mk |2
l10ntools/inc/export.hxx | 23 +
l10ntools/inc/gsicheck.hxx | 60
l10ntools/source/gsicheck.cxx | 456 +
l10ntools/source/gsimain.cxx | 437 +++
l10ntools/source/helpmerge.cxx | 10
l10ntools/source/merge.cxx |9
8 files changed, 558 insertions(+), 445 deletions(-)
New commits:
commit 4ced2d99db7ac1be3af8c114757abf3caae1b555
Author: Andras Bartek
Date: Thu Sep 6 21:11:23 2012 +0200
fdo#52246 let helpex use gsicheck's tag checker
So the build will not break on translations errors in help.
English segment will be used, when the localized segment
has fatal error in it, e.g. a tag error that results in
invalid xml.
Change-Id: I8a74649d1f00f6379a7244f2582d27b8a437cd2f
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index 917c00f..fceb61a 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -34,10 +34,12 @@ $(eval $(call gb_Executable_set_include,gsicheck,\
$(eval $(call gb_Executable_use_libraries,gsicheck,\
sal \
))
+$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
+transex \
+))
$(eval $(call gb_Executable_add_exception_objects,gsicheck,\
-l10ntools/source/gsicheck \
-l10ntools/source/tagtest \
+l10ntools/source/gsimain \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/StaticLibrary_transex.mk
b/l10ntools/StaticLibrary_transex.mk
index e8c84b7..f9dd165 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/merge \
l10ntools/source/file \
l10ntools/source/directory \
+l10ntools/source/tagtest \
+l10ntools/source/gsicheck \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a1c66e3..8e4be09 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -71,6 +71,9 @@ typedef boost::unordered_map
typedef boost::unordered_map
MergeDataHashMap;
+typedef boost::unordered_map
+LineNumberHashMap;
+
#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
#define LIST_REFID "LIST_REFID"
@@ -374,23 +377,36 @@ private:
OStringBoolHashMap bQuickHelpTextFirst;
OStringHashMap sTitle;
OStringBoolHashMap bTitleFirst;
+OStringHashMap sSDFLine;
+LineNumberHashMap nLine;
public:
PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
+const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
+const rtl::OString &rSDFLine, const std::size_t nLineIn)
{
-
sText[ rId ] = rText;
bTextFirst[ rId ] = true;
sQuickHelpText[ rId ] = rQuickHelpText;
bQuickHelpTextFirst[ rId ] = true;
sTitle[ rId ] = rTitle;
bTitleFirst[ rId ] = true;
+sSDFLine[ rId ] = rSDFLine;
+nLine[ rId ] = nLineIn;
}
sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const
rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
+rtl::OString & GetSDF(const rtl::OString &nLangIndex)
+{
+return sSDFLine[nLangIndex];
+}
+
+std::size_t GetNLine(const rtl::OString &nLangIndex)
+{
+return nLine[nLangIndex];
+}
};
//
@@ -444,7 +460,8 @@ class MergeDataFile
const rtl::OString &rLID, const rtl::OString &rPFO,
const rtl::OString &nLang, const rtl::OString &rTEXT,
const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-const rtl::OString &sFilename, bool bCaseSensitive);
+const rtl::OString &sFilename, bool bCaseSensitive,
+const rtl::OString &rSDF, std::size_t nLine);
public:
explicit MergeDataFile(const rtl::OString &rFileName,
const rtl::OString& rFile, bool bCaseSensitive);
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 467925e..266ea96 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -33,6 +33,7 @@
#include
#include
+#include
#include "tagtest.hxx"
@@ -131,6 +132,65 @@ public:
void WriteFixed( LazyStream &aFixOut );
};
+sal_Bool check(rtl::OString s,std::size_t nLine);
+
+void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg,
rtl::OString const & aPrefix,
+ rtl::OString const & aContext,
[Libreoffice-commits] .: vcl/inc
vcl/inc/vcl/fontmanager.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23cd24bd4d4df9247f8f0496f9934a2ce6d110dd
Author: Michael Stahl
Date: Thu Sep 6 20:45:49 2012 +0200
vcl: export PrintFontManager
PrintFontManager is accessed from sw since
11f7d6aca36b25fb0b225cd0c641cd4f09338672
Change-Id: Ia8124acfa15386b126af2133830e1803bcf1a70f
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 81b4200..b659435 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -153,7 +153,7 @@ class FontCache;
class FontCache;
-class VCL_PLUGIN_PUBLIC PrintFontManager
+class VCL_DLLPUBLIC PrintFontManager
{
struct PrintFont;
struct TrueTypeFontFile;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: gbuild: disable symbols on --enable-dbgutil --disable-symbol...
>From Michael Stahl : Michael Stahl has uploaded a new change for review. Change subject: gbuild: disable symbols on --enable-dbgutil --disable-symbols .. gbuild: disable symbols on --enable-dbgutil --disable-symbols Due to the setup of gb_DEBUGLEVEL in gbuild.mk, gb_SYMBOL was always enabled when --enable-dbgutil is set, with no way to override it. Fix that by turning configure's ENABLE_SYMBOLS into a tri-state, where the new "FALSE" value, set by an explicit --disable-symbols, overrides any implicit way of enabling symbols. But by default an --enable-dbgutil still enables gb_SYMBOL. Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d (cherry picked from commit d9cbc837f84c415f5949a6893764dae8268f0d85) --- M berkeleydb/makefile.mk M configure.in M solenv/gbuild/gbuild.mk M solenv/inc/settings.mk 4 files changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/572/1 -- To view, visit https://gerrit.libreoffice.org/572 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] boost: disable bizarre "auto link" feature for MSVC:
>From Michael Stahl : Michael Stahl has uploaded a new change for review. Change subject: boost: disable bizarre "auto link" feature for MSVC: .. boost: disable bizarre "auto link" feature for MSVC: Boost apparently uses a MSVC auto-link feature to cause MSVC to request a static library with a very particular name; disable this and remove the associated workaround boost/Package_boostdatetime.mk. (Another alternative better than Package_boostdatetime.mk would be to just mangle the static library name in RepositoryFixes.mk) Change-Id: Iea91f9978da00d89d2a696f3cdd090a85cea8e64 --- M RepositoryExternal.mk M boost/Module_boost.mk D boost/Package_boostdatetime.mk M boost/StaticLibrary_boostdatetime.mk 4 files changed, 10 insertions(+), 21 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/571/1 -- To view, visit https://gerrit.libreoffice.org/571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea91f9978da00d89d2a696f3cdd090a85cea8e64 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svl/source
svl/source/items/style.cxx|3 ++-
svl/source/misc/inethist.cxx |6 +++---
svl/source/misc/strmadpt.cxx | 11 ++-
svl/source/numbers/numuno.cxx |2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit a3ffd9ed6ee0723de407691de93340af9975d3b7
Author: Arnaud Versini
Date: Sun Sep 2 14:55:54 2012 +0200
Replace usage of rtl/memory.h in svl with equivalent from string.h
Change-Id: I44e6b162a190939bfa17e04f551309d6249c48df
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 06f70e0..3f6b768 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#ifdef DBG_UTIL
class DbgStyleSheetReferences
@@ -942,7 +943,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const
::com::sun::star::un
::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const
::com::sun::star::uno::Sequence< ::sal_Int8 >& rId ) throw
(::com::sun::star::uno::RuntimeException)
{
-if( rId.getLength() == 16 && 0 == rtl_compareMemory(
getIdentifier().getConstArray(), rId.getConstArray(), 16 ) )
+if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(),
rId.getConstArray(), 16 ) )
{
return
sal::static_int_cast(reinterpret_cast(this));
}
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 3530ced..8233358 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -20,10 +20,10 @@
#include
#include
+#include
#include "rtl/instance.hxx"
#include "rtl/crc.h"
-#include "rtl/memory.h"
#include
#include
#include
@@ -273,7 +273,7 @@ void INetURLHistory_Impl::move (sal_uInt16 nSI, sal_uInt16
nDI)
if (nSI < nDI)
{
// shift left.
-rtl_moveMemory (
+memmove (
&m_pHash[nSI],
&m_pHash[nSI + 1],
(nDI - nSI) * sizeof(hash_entry));
@@ -281,7 +281,7 @@ void INetURLHistory_Impl::move (sal_uInt16 nSI, sal_uInt16
nDI)
if (nSI > nDI)
{
// shift right.
-rtl_moveMemory (
+memmove (
&m_pHash[nDI + 1],
&m_pHash[nDI],
(nSI - nDI) * sizeof(hash_entry));
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index cf1d41e..77a8676 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -23,8 +23,9 @@
#include
#include
#include
+#include
+
#include
-#include
#include
#include
#include
@@ -511,7 +512,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong
nSize)
SetError(ERRCODE_IO_CANTREAD);
return nRead;
}
-rtl_copyMemory(static_cast< sal_Int8 * >(pData) + nRead,
+memcpy(static_cast< sal_Int8 * >(pData) + nRead,
aBuffer.getConstArray(), sal_uInt32(nCount));
nRead += nCount;
if (nCount < nRemain)
@@ -879,7 +880,7 @@ sal_uInt32 SvDataPipe_Impl::read()
sal_uInt32 nBlock = std::min(sal_uInt32(m_pReadPage->m_pEnd
- m_pReadPage->m_pRead),
nRemain);
-rtl_copyMemory(m_pReadBuffer, m_pReadPage->m_pRead, nBlock);
+memcpy(m_pReadBuffer, m_pReadPage->m_pRead, nBlock);
m_pReadPage->m_pRead += nBlock;
m_pReadBuffer += nBlock;
m_nReadBufferSize -= nBlock;
@@ -942,7 +943,7 @@ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer,
sal_uInt32 nSize)
if (nBlock > 0)
{
-rtl_copyMemory(m_pReadBuffer + m_nReadBufferFilled, pBuffer,
+memcpy(m_pReadBuffer + m_nReadBufferFilled, pBuffer,
nBlock);
m_nReadBufferFilled += nBlock;
nRemain -= nBlock;
@@ -963,7 +964,7 @@ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer,
sal_uInt32 nSize)
= std::min(sal_uInt32(m_pWritePage->m_aBuffer + m_nPageSize
- m_pWritePage->m_pEnd),
nRemain);
-rtl_copyMemory(m_pWritePage->m_pEnd, pBuffer, nBlock);
+memcpy(m_pWritePage->m_pEnd, pBuffer, nBlock);
m_pWritePage->m_pEnd += nBlock;
pBuffer += nBlock;
nRemain -= nBlock;
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index ee68795..8e5b4a1 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -106,7 +106,7 @@ sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething(
const uno::Sequence& rId )
throw(uno::RuntimeException)
{
if ( rId.getLength() == 16 &&
- 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+ 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |4 +++-
sd/source/ui/remotecontrol/DiscoveryService.cxx |6 --
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit cbb8612465ec8d809ff00fef38bcc6cad1d4dac0
Author: Andrzej J.R. Hunt
Date: Thu Sep 6 20:22:28 2012 +0200
Replace DBusGObjectPath with char to hopefully compile on older dbus-glib.
The typedef for DBusGObjectPath is only present in newer versions of
dbus-glib.
It is equivalent to a gchar.
Change-Id: I1660234760fde7c7d88721f39d86a820c89040cc
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 170c51c..691951b 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -64,7 +64,9 @@ void BluetoothServer::execute()
}
gboolean aResult;
-DBusGObjectPath *aAdapterPath = NULL;
+// The following should be a DBusGObjectPath, however the necessary
+// typedef is missing in older version of dbus-glib.
+char *aAdapterPath = NULL;
aResult = dbus_g_proxy_call( aManager, "DefaultAdapter", &aError,
G_TYPE_INVALID,
DBUS_TYPE_G_OBJECT_PATH, &aAdapterPath,
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 53e649c..51982a3 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -65,14 +65,16 @@ DiscoveryService::~DiscoveryService()
void DiscoveryService::execute()
{
char aBuffer[BUFFER_SIZE];
-
+fprintf( stderr,"Created\n" );
while ( true )
{
memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
sockaddr_in aAddr;
socklen_t aLen = sizeof( aAddr );
+fprintf( stderr,"REcing\n" );
recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen
);
-
+fprintf( stderr,"Reced\n" );
+fprintf( stderr, "Received from\n" );
OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) );
if ( aString.compareTo( "LOREMOTE_SEARCH" ) == 0 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: boost/Module_boost.mk boost/Package_boostdatetime.mk
boost/Module_boost.mk |6 ++ boost/Package_boostdatetime.mk | 14 ++ 2 files changed, 20 insertions(+) New commits: commit 01129788745ae8591a3ff9d2b46a54aaa58844c1 Author: Matúš Kukan Date: Thu Sep 6 19:08:33 2012 +0200 boost: create also libboost_date_time-vc90-mt-1_44.lib Change-Id: I1e48b478a42d2b554e165922b08354b971f971b9 diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk index 747860c..0dda414 100644 --- a/boost/Module_boost.mk +++ b/boost/Module_boost.mk @@ -16,6 +16,12 @@ $(eval $(call gb_Module_add_targets,boost,\ UnpackedTarball_boost \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,boost,\ + Package_boostdatetime \ +)) +endif + endif # vim: set noet sw=4 ts=4: diff --git a/boost/Package_boostdatetime.mk b/boost/Package_boostdatetime.mk new file mode 100644 index 000..d0af671 --- /dev/null +++ b/boost/Package_boostdatetime.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,boostdatetime,$(gb_StaticLibrary_OUTDIRLOCATION))) + +$(eval $(call gb_Package_add_file,boostdatetime,lib/libboost_date_time-vc90-mt-1_44.lib,$(notdir $(call gb_StaticLibrary_get_target,boostdatetime + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Inadvertent omit of Events node from Jobs-onlineupdate.xcu
>From Jan Holesovsky : Jan Holesovsky has submitted this change and it was merged. Change subject: Inadvertent omit of Events node from Jobs-onlineupdate.xcu .. Inadvertent omit of Events node from Jobs-onlineupdate.xcu ...causing update check to not run due to the missing JobList entry. Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b --- M extensions/source/update/check/org/openoffice/Office/Jobs.xcu 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/570 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann Gerrit-Reviewer: Jan Holesovsky ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extensions/source
extensions/source/update/check/org/openoffice/Office/Jobs.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3044d50775afd105db322ab79a08e218ddc8ff7 Author: Stephan Bergmann Date: Thu Sep 6 17:39:10 2012 +0200 Inadvertent omit of Events node from Jobs-onlineupdate.xcu ...causing update check to not run due to the missing JobList entry. Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b Reviewed-on: https://gerrit.libreoffice.org/570 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu index cf2e1cc..722e8be 100644 --- a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu @@ -31,7 +31,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/globstr.hrc |4 +++-
sc/source/core/data/attarray.cxx | 34 ++
sc/source/core/data/fillinfo.cxx | 21 -
sc/source/core/data/table2.cxx |3 ++-
sc/source/ui/src/globstr.src |4
sc/source/ui/view/cellsh1.cxx| 12
6 files changed, 71 insertions(+), 7 deletions(-)
New commits:
commit 24712398aa28b5a612a9a2bdeecd51d3eb9535e8
Author: Markus Mohrhard
Date: Thu Sep 6 18:52:12 2012 +0200
handle protection in conditional formats correctly, fdo#51636
Change-Id: I81d7369218ae8e361f15d811952a8f690a32df96
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 6cf487f..bcba4de 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1189,7 +1189,41 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2,
sal_uInt16 nMask ) const
{
const ScProtectionAttr* pProtect =
(const ScProtectionAttr*) &pPattern->GetItem(
ATTR_PROTECTION );
+bool bFoundTemp = false;
if ( pProtect->GetProtection() || pProtect->GetHideCell() )
+bFoundTemp = true;
+
+const SfxUInt32Item* pConditional =
+(const SfxUInt32Item*) &pPattern->GetItem(
ATTR_CONDITIONAL );
+if ( pConditional->GetValue() != 0 )
+{
+SCROW nRowStartCond = std::max( nRow1, i ?
pData[i-1].nRow + 1: 0 );
+SCROW nRowEndCond = std::min( nRow2, pData[i].nRow );
+bool bFoundCond = false;
+for(SCROW nRowCond = nRowStartCond; nRowCond <= nRowEndCond &&
!bFoundCond; ++nRowCond)
+{
+const SfxItemSet* pSet = pDocument->GetCondResult( nCol,
nRowCond, nTab );
+
+const SfxPoolItem* pItem;
+if( pSet && pSet->GetItemState( ATTR_PROTECTION, true,
&pItem ) == SFX_ITEM_SET )
+{
+const ScProtectionAttr* pCondProtect =
static_cast(pItem);
+if( pCondProtect->GetProtection() ||
pProtect->GetHideCell() )
+bFoundCond = true;
+}
+else
+{
+// well it is not true that we found one
+// but existing one + cell where conditional
+// formatting does not remove it
+// => we have a protected cell
+bFoundCond = true;
+}
+}
+bFoundTemp = bFoundCond;
+}
+
+if(bFoundTemp)
bFound = true;
}
if ( nMask & HASATTR_ROTATE )
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 743aa26..1ee5a51 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -533,11 +533,6 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL
nX1, SCROW nY1, SCCOL nX
pThisRowInfo->bEmptyBack = false;
}
-if (bHidden || ( bFormulaMode && bHideFormula
&& pInfo->pCell
-&&
pInfo->pCell->GetCellType()
-== CELLTYPE_FORMULA ))
-pInfo->bEmptyCellText = true;
-
if ( pCondForm )
{
ScCondFormatData aData =
pCondForm->GetData( pInfo->pCell,
@@ -551,6 +546,17 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL
nX1, SCROW nY1, SCCOL nX
//! Style-Sets cachen !!!
pInfo->pConditionSet =
&pStyleSheet->GetItemSet();
bAnyCondition = true;
+
+// we need to check already here
for protected cells
+const SfxPoolItem* pItem;
+if ( bTabProtect &&
pInfo->pConditionSet->GetItemState( ATTR_PROTECTION, true, &pItem ) ==
SFX_ITEM_SET )
+{
+const ScProtectionAttr*
pProtAttr = static_cast(pItem);
+bHidden =
pProtAttr->GetHideCell();
+bHideFormula =
pProtAttr->GetHideFormula();
+
+}
+
}
// if style is not there, treat like
no condition
}
@@ -565,6 +571,11 @@ void ScDocument::FillInfo
[Libreoffice-commits] .: berkeleydb/makefile.mk configure.in solenv/gbuild solenv/inc
berkeleydb/makefile.mk |2 +-
configure.in|6 +-
solenv/gbuild/gbuild.mk | 16 ++--
solenv/inc/settings.mk |2 +-
4 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit d9cbc837f84c415f5949a6893764dae8268f0d85
Author: Michael Stahl
Date: Thu Sep 6 18:43:15 2012 +0200
gbuild: disable symbols on --enable-dbgutil --disable-symbols
Due to the setup of gb_DEBUGLEVEL in gbuild.mk, gb_SYMBOL was always
enabled when --enable-dbgutil is set, with no way to override it.
Fix that by turning configure's ENABLE_SYMBOLS into a tri-state, where
the new "FALSE" value, set by an explicit --disable-symbols, overrides
any implicit way of enabling symbols.
But by default an --enable-dbgutil still enables gb_SYMBOL.
Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index eff14b8..c68a404 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -82,7 +82,7 @@ CXXFLAGS:=
.IF "$(COM)"=="GCC"
CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
-.IF "$(ENABLE_SYMBOLS)"!=""
+.IF "$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE"
CFLAGS+=-g
CXXFLAGS+=-g
.ENDIF
diff --git a/configure.in b/configure.in
index 754c79d..5291f0f 100644
--- a/configure.in
+++ b/configure.in
@@ -4048,7 +4048,11 @@ if test -n "$enable_symbols" -a "$enable_symbols" !=
"no"; then
ENABLE_SYMBOLS="TRUE"
AC_MSG_RESULT([yes])
else
-ENABLE_SYMBOLS=
+if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
+ENABLE_SYMBOLS="FALSE"
+else
+ENABLE_SYMBOLS=
+fi
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_SYMBOLS)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e1be999..d9da37d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -76,12 +76,6 @@ else
gb_PRODUCT := $(false)
endif
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
-gb_SYMBOL := $(true)
-else
-gb_SYMBOL := $(false)
-endif
-
gb_TIMELOG := 0
ifneq ($(strip $(TIMELOG)$(timelog)),)
gb_TIMELOG := 1
@@ -117,8 +111,18 @@ ENABLE_DEBUG_FOR := all
endif
endif
+ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
+gb_SYMBOL := $(false)
+else
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
+gb_SYMBOL := $(true)
+else
ifneq ($(gb_DEBUGLEVEL),0)
gb_SYMBOL := $(true)
+else
+gb_SYMBOL := $(false)
+endif
+endif
endif
ifneq ($(nodep),)
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 230c060..e24c0e6 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1040,7 +1040,7 @@ CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
CDEFS+= -DSUPD=$(UPD)
# flags to enable build with symbols; required for crashdump feature
-.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") ||
"$(ENABLE_SYMBOLS)"!=""
+.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") ||
("$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE")
# if debug is enabled, this may enable less debug info than debug, so rely
just on debug
.IF "$(debug)" == ""
CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bugs 38840+39596: Coverage analysis and static analysis: Whats next ?
On Thu, Sep 6, 2012 at 2:53 PM, Michael Meeks wrote:
>
> On Thu, 2012-09-06 at 13:15 +0200, John Smith wrote:
>> Alright, let me see if I understand this one correctly first. You
>> basically want people to be able to find out what gets "#define" 'd in
>> what rc files ? So for example, you want people to search for
>> "FL_RECORD" to discover that that gets defined in
>> './sw/source/ui/envelp/mailmrge.hrc" ?
>
> Nope it's worse than that; we want to go from "Export" to:
>
> String STR_PDF_EXPORT
> {
> Text[ en-US ] = "E~xport";
> };
>
I still dont understand. Something to do with my lack of understanding
C++, I guess. Feel free to ignore or answer as you see fit; I doubt
ill be able to do what is needed at this point anyway. So what would
be needed as input, and what would be the output ?
You want people to be able to enter "Records" as input, and have it
output this :
FixedLine FL_RECORD
{
Pos = MAP_APPFONT ( 6 , 86 ) ;
Size = MAP_APPFONT ( 126 , 8 ) ;
Text [ en-US ] = "Records" ;
};
as it is listed in "./sw/source/ui/envelp/mailmrge.src" ?
Or, more strictly: have people enter "Drawing View", to output
String SID_SD_A11Y_D_DRAWVIEW_N
{
Text [ en-US ] = "Drawing View";
};
as listed in "./sd/source/ui/accessibility/accessibility.src", but
*only* for the cases where it says exactly "String ALL_CAPS_HERE",
*and* the only thing between the curly braces is :
Text [ en-US ] = "Drawing View"
?
- John.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help fixing fdo#38557
Hi Niklas, Sadly I'm no writer expert :-) did you get any further ? if not Cedric is one person with a good overview there I suspect; Cedric ? ATB, Michael. On Fri, 2012-08-31 at 17:40 +0200, Niklas Johansson wrote: > I'm currently looking at fdo#38557 [1] and could use some pointers. > Summary of the bug: After using the Header and footer dialog (View menu) > changes does not get displayed until you add a new page (or something > else that triggers an update of the page layout). > > I tracked down the dialog to headerfooterdlg.cxx [2] the > HeaderFooterDialog:apply is called from ApplyToAll or Apply depending on > witch button you press. > > In HeaderFooterDialog::apply the properties from the dialog is set but > it does not update the view on screen. > > Where is such an update supposed to happen? In the execute function? Is > it even supposed to be handled in headerfooterdlg.cxx or do I have to go > deeper? > > > [1] https://bugs.freedesktop.org/show_bug.cgi?id=38557 > [2] > http://opengrok.libreoffice.org/xref/core/sd/source/ui/dlg/headerfooterdlg.cxx#304 > -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 47919e05f68a6871031b92ad028e4345a51bf5c9 Author: LuboÅ¡ LuÅák Date: Thu Sep 6 18:06:15 2012 +0200 ++bloody_sal_Int32_die_die_die Change-Id: Ie10748357aa25fc15c05fc1a55434bfa0af9712f diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 6590b8a..f9de95a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2837,7 +2837,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c if( file.open( osl_File_OpenFlag_Write ) != osl::File::E_None ) return; uno::Reference< com::sun::star::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream( -OUString( "word/fonts/font" ) + OUString::valueOf( m_nextFontId ) + ".ttf", +OUString( "word/fonts/font" ) + OUString::valueOf( static_cast< sal_Int32 >( m_nextFontId )) + ".ttf", "application/vnd.openxmlformats-officedocument.obfuscatedFont" ); // Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway, // so just alter the first and last part of the key. @@ -2888,7 +2888,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c xOutStream->closeOutput(); OString relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font";, -OUString( "fonts/font" ) + OUString::valueOf( m_nextFontId ) + ".ttf" ), RTL_TEXTENCODING_UTF8 ); +OUString( "fonts/font" ) + OUString::valueOf( static_cast< sal_Int32 >( m_nextFontId )) + ".ttf" ), RTL_TEXTENCODING_UTF8 ); m_pSerializer->singleElementNS( XML_w, tag, FSNS( XML_r, XML_id ), relId.getStr(), FSNS( XML_w, XML_fontKey ), fontKeyStr, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/ooxmlimport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 982b7cb498c3ea1106c5d2184f84989d99b1d942
Author: LuboÅ¡ LuÅák
Date: Thu Sep 6 17:59:22 2012 +0200
actually use startsWith(), now that it really exists
Change-Id: I0f1557f480e9d20d4ead359ad0eaa75db9b8f9db
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 12e20a6..50b06e0 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -416,7 +416,7 @@ OUString SmOoxmlImport::handleFunc()
stream.ensureOpeningTag( M_TOKEN( func ));
OUString fname = readOMathArgInElement( M_TOKEN( fName ));
// fix the various functions
-if( fname.match( "lim csub {", 0 )) // startsWith()
+if( fname.startsWith( "lim csub {" ))
fname = "lim from {" + fname.copy( 10 );
OUString ret = fname + " {" + readOMathArgInElement( M_TOKEN( e )) + "}";
stream.ensureClosingTag( M_TOKEN( func ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Question about fdo#45702 - UI: RTL Direction and Asian Text orientation buttons can not be hidden
Hi there, On Wed, 2012-09-05 at 12:08 +, Manal M. Alhassoun wrote: > I'm currently looking at bug #45702 (1). Great :-) it's an interesting choice of bug. > Since LibreOffice intended to work this way, put these buttons on > "Visible Buttons" and "Customize Toolbar" make no sense. I guess so. > I'm wondering if we can solve this by just remove them from "Visible > Buttons" and "Customize Toolbar". Might solve it; I'm not so convinced that not allowing the user to hide them is not the real bug - but fixing it in either way would be fine I suspect :-) > The reason that makes me ask this question is that this bug is exists > since the OpenOffice (2). Ah - there are plenty of these around. > and I'm sure that several solutions were proposed to deal with this > bug since then and my suggested solution maybe In general, I'd suggest you do what you think best and looks easiest / cleanest in the code :-) if it's a really tricky one good to ask the libreoffice-ux-adv...@lists.freedesktop.org list - but they have some more meaty things to worry about just now :-) > So, should I go for this solution or it's not an appropriate? Go for it - I look forward to the patch :-) Thanks ! Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Inadvertent omit of Events node from Jobs-onlineupdate.xcu
>From Stephan Bergmann : Stephan Bergmann has uploaded a new change for review. Change subject: Inadvertent omit of Events node from Jobs-onlineupdate.xcu .. Inadvertent omit of Events node from Jobs-onlineupdate.xcu ...causing update check to not run due to the missing JobList entry. Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b --- M extensions/source/update/check/org/openoffice/Office/Jobs.xcu 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/570/1 -- To view, visit https://gerrit.libreoffice.org/570 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extensions/source
extensions/source/update/check/org/openoffice/Office/Jobs.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf0dd7b95d699264934ef1234ad8d1bc227974f9 Author: Stephan Bergmann Date: Thu Sep 6 17:39:10 2012 +0200 Inadvertent omit of Events node from Jobs-onlineupdate.xcu ...causing update check to not run due to the missing JobList entry. Change-Id: If855259ac86340763e4b0fa8266f011f8980d61b diff --git a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu index cf2e1cc..722e8be 100644 --- a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu @@ -31,7 +31,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Norbert, Lionel, David, Andras, Kendy, Michael M, Stephan, Mitch, Michael S, Petr, Tor, Cedric, Caolan, Astron, Kohei * Completed Action Items + notify QA list of need for calc / late-feature testing (Eike) + invite successful GSOC students to come to the conference (Cedric) * Pending Action Items + make bytemark windows box do release builds (Fridrich) + crediting: can we separate templates in the credits page (Spaetz) + gerrit - patch abandonment can only be done by owner or gerrit admin (Bjoern) + gerrit - update docs in wiki (Bjoern) + [in progress] change msi installer scripts to cut down number of dicts, according to system locale (Stephan) * Release Engineering update (Petr) + 3.6.2 rc1 - next Monday: September 10th + want another review / approval for Eike's feature / patch from non-affiliated person. + two weeks rc1 -> rc2 + 3.5.7 rc1 - September 17th + deadline for 3.7.1 rc1 the same date as 3.7.0 final + Petr to decide: switch to a one week gap here to fix overlap. * UI / design update (Astron) + re-think our bundled font list + need to create a nice size limit of new fonts (Kendy) + allow download / selection / install of new fonts (Kendy?) + in-document font embedding implementation underway thanks to Lubos + click-to-show header add/remove feature/fix feedback + merged to -3-6 to general applause (thanks to Cedric) + gradient-fill for cells: http://lists.freedesktop.org/archives/libreoffice-ux-advise/2012-September/001365.html + will have a look. + borders query: http://lists.freedesktop.org/archives/libreoffice-ux-advise/2012-August/001350.html + interesting problem requiring design input + options cleanup research ongoing * QA update (Rainer) + more complication wrt. when to 'close' bugs ... + affects every engineer ... + HardHacks: ID OS Component - Summary 38913 Windows Libreoffice - CRASH when loading Danish dictionary at startup citing msvcr90.dll after upgrade + potentially jvm dll at fault, use a workaround to avoid fatal crash when called API called with an illegal argument. + fixed - thanks to Stephan, custom handler works around crash. 32948 Linux Libreoffice/Database(?) - Address Book Data Source Wizard fails with message "No SDBC driver was found" + bug-log mixes several different issues, very unclear. + please open separate, new, clean issues & re-report. + one is split to bug#54450 Evo/Addressbook doesn't work + David to kindly look into it. AI: + enable evolution connector in distro-config for Linux (Lionel) 34548 All Presentation - EDITING: CRASH in action after Undo + valgrind trace preferred. 36681 All Writer - EDITING: after insert/removal of a picture (or alike) view scrolls to begin/end of document + nasty cases where picture anchored to the page, and inserting paragraphs afterwards, screen showed the 1st page - due to stale layout info. + fixed by Cedric. 33302 Mac Libreoffice - FILEOPEN/EDITING RTL text: parentheses and brackets "(...) [...]" inverted to ")...( ]...[" with some fonts + Mac volunteers appreciated. * dictionary bundling (Stephan) + reduce default number of pre-selected dictionaries, as for UI installs AI: + change pre-selection of default dictionaries to install (Stephan) * defensive vs. abortive programming (continued) + debug-builds from Stephan's tinderbox have aborts enabled + failing hard in writer (Lionel) + most QA people are not using debug builds - so we don't get the benefit + delay: discussion - Rainer back next week (Petr) + is it one high-frequency bug ? + reason to use abort() -> people wake up and fix it (Michael S) + what is the run-time cost etc. + on Mac - a few Mb. (Norbert) + no configure parameter for assertions, but not symbols (Michael S) + the symbols are potentially huge but useful. + badly need the Windows symbol server (Fridrich) AI: + enable debug bits for Mac tinderbox (Norbert) + change consequences of copy to be more defensive (No
[Libreoffice-commits] .: 6 commits - offapi/com sw/inc sw/source vcl/generic vcl/inc writerfilter/source
offapi/com/sun/star/document/Settings.idl | 15 ++
sw/inc/IDocumentSettingAccess.hxx |4
sw/inc/doc.hxx|2
sw/source/core/doc/doc.cxx|8 +
sw/source/core/doc/docnew.cxx |2
sw/source/filter/ww8/docxattributeoutput.cxx | 91
sw/source/filter/ww8/docxattributeoutput.hxx |7
sw/source/filter/ww8/docxexport.cxx |6
sw/source/filter/ww8/wrtw8sty.cxx |3
sw/source/filter/ww8/wrtww8.hxx |2
sw/source/ui/uno/SwXDocumentSettings.cxx | 28 +++
vcl/generic/fontmanager/fontmanager.cxx | 43 ++
vcl/inc/vcl/fontmanager.hxx | 23 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 -
writerfilter/source/dmapper/FontTable.cxx | 127 ++
writerfilter/source/dmapper/FontTable.hxx | 18 ++
writerfilter/source/dmapper/PropertyIds.cxx |2
writerfilter/source/dmapper/PropertyIds.hxx |2
writerfilter/source/dmapper/SettingsTable.cxx | 20 ++
writerfilter/source/dmapper/SettingsTable.hxx |3
writerfilter/source/ooxml/Handler.cxx | 28 +++
writerfilter/source/ooxml/Handler.hxx | 12 +
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |9 +
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |3
writerfilter/source/ooxml/factoryimpl_ns.xsl |3
writerfilter/source/ooxml/model.xml |1
27 files changed, 461 insertions(+), 13 deletions(-)
New commits:
commit 11f7d6aca36b25fb0b225cd0c641cd4f09338672
Author: LuboÅ¡ LuÅák
Date: Wed Sep 5 15:02:17 2012 +0200
basic .docx write support for embedded fonts
Docx embedded fonts now should be usable for practical use,
although there is still a number of small todos:
- fonts are embedded when saving only if the document had embedded
fonts when it was opened (this means the document needed to be
saved in MSO first with the option enabled), there's no UI
to enable it and it's a question if it makes sense on Linux
- w:embedSystemFonts is similarly questionable, given that the spec
is very vague on what system fonts are supposed to be
- font subsetting is ignored, when reading a document, the font
is simply used and it is hoped it will work (that should mean
the document should not be modified, otherwise glyphs may be missing
for the new text), write has no support for subsetting; also, since
fonts are global for LO, opening several documents with the same
but differently subset font probably will not work
Change-Id: I470a9f2857738a10e82546223412bd9320841e65
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 652a7cc..6590b8a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -118,9 +118,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
@@ -130,6 +132,7 @@
#include
#include
#include
+#include
#include
#if OSL_DEBUG_LEVEL > 1
@@ -2809,6 +2812,90 @@ void DocxAttributeOutput::FontPitchType( FontPitch
ePitch ) const
FSEND );
}
+void DocxAttributeOutput::EmbedFont( const OUString& name )
+{
+if( !m_rExport.pDoc->get( IDocumentSettingAccess::EMBED_FONTS ))
+return; // no font embedding with this document
+EmbedFontStyle( name, XML_embedRegular, "" );
+EmbedFontStyle( name, XML_embedBold, "b" );
+EmbedFontStyle( name, XML_embedItalic, "i" );
+EmbedFontStyle( name, XML_embedBoldItalic, "bi" );
+}
+
+static inline char toHexChar( int value )
+{
+return value >= 10 ? value + 'A' - 10 : value + '0';
+}
+
+void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const
char* style )
+{
+OUString fontUrl = psp::PrintFontManager::get().fileUrlForTemporaryFont(
name, style );
+// If a temporary font file exists for this font, assume it was embedded
+// and embed it again.
+// TODO IDocumentSettingAccess::EMBED_SYSTEM_FONTS
+osl::File file( fontUrl );
+if( file.open( osl_File_OpenFlag_Write ) != osl::File::E_None )
+return;
+uno::Reference< com::sun::star::io::XOutputStream > xOutStream =
m_rExport.GetFilter().openFragmentStream(
+OUString( "word/fonts/font" ) + OUString::valueOf( m_nextFontId ) +
".ttf",
+"application/vnd.openxmlformats-officedocument.obfuscatedFont" );
+// Not much point in trying hard with the obfuscation key, whoever reads
the spec can read the font anyway,
+// so just alter the first and last part of the key.
+cha
Re: Shift 3.7.0 or 3.7.X releases - was: ANNOUNCE: Release plan updated - two weeks between RCs
Petr Mladek píše v Po 03. 09. 2012 v 18:41 +0200: > > > 4. Do 3.7.0-RCs every week (use the original schedule). There is not > > >enough time for feedback => demotivating for QA. > > After all, this is still good solution. We released, 3.5 and 3.6 this > way and it somehow worked. The .0 release is always hectic and we get > many fixes every week, so the two weeks delay between rc2 and rc3 would > be too long. After all we used something close to this. The schedule is: + Week 2: 3.7.0-rc1 + Week 3: + Week 4: 3.7.0-rc2 + Week 5: 3.7.0-rc3 + Week 6: 3.7.0-release + Week 7: + Week 8: 3.7.1-rc1 + Week 9: 3.7.1-rc2 + Week 10: 3.7.1-release + Week 11: 3.7.2-rc1 + Week 12: + Week 13: 3.7.2-rc2 + Week 14: 3.7.2-release + Week 15: 3.7.3-rc1 + Week 16: + Week 17: 3.7.4-rc2 + Week 18: 3.7.4-release By other words, I moved 3.7.0-rc3 and 3.7.1.rc1 and created space between them. It is not ideal but we will do it better in the future releases. See also https://wiki.documentfoundation.org/ReleasePlan Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Java cleanup, remove unnecessary imports
On 06/09/12 15:07, Noel Grandin wrote: > Hi > > These 2 patches do a sweep across 99% of the Java code in the LO tree, > removing unneeded imports. > > They pass a full make check. one hunk didn't apply in nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java , apparently that is CRLF infested... pushed the rest to master ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: another boundaries for libmerged
Hi Matus, On Sat, 2012-09-01 at 21:36 +0200, Matúš Kukan wrote: > last time I was merging new libs [0], it was nightmare. :-) > I tried too much and then had to keep basegfx, i18nisolang and tl > unmerged because they are used for executables such as rsc and svidl > which are used before libmerged is created, so there would be cyclic > dependencies. Oh drat, that is annoying. I wonder if we can create multiple shared libraries from the same object files to solve that - and link the build-time tools to those (?). > I think we are ~done with general libraries needed when launching LibreOffice. Sounds great - how many did we manage to ram into libmerged ? > I would appreciate if someone could check (review) > https://gerrit.libreoffice.org/#/c/480/ Looks fine to me :-) > It's a little annoying when you need to do things as > http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4f030f0e3a702e6398698eff08e21141f2c761f > but after gbuild_ure is in master I will probably try to merge > something, once more time. (from stoc/ ..) I assume it is still needed for > android ? Yes - we're still under significant shlib count pressure on android sadly; and of course for iOS we'll need to statically link ~everything into one binary - which is rather more of a fun challenge :-) Thanks ! Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: JAXTHelper vs LibXSLTTransformer, which one is preferred?
On Thu, 2012-09-06 at 10:19 +0200, David Tardon wrote: > Hi, > > On Wed, Sep 05, 2012 at 03:18:36PM +0200, Peter Jentsch wrote: > > Splitting the Saxon stuff should be possible and has been one of the goals > > of the libxslt port. I haven't tested that, though. > > I tried to do the first step--building the java transformer as an > extension--a couple of weeks ago ... I am going to give it > another try soon. ah!, shiny. That saxon really bugs me as it's an out of date version, but later versions can't be used because they miss the required features. > Anyway, I think there are going to be code changes needed. Some problems > that need to be addressed: the XSLT filter configuration dialog allows > to say that the java transformer should be used. But what if it is not > available? (Disable the config. item? But the filter will not work...) > What if it _had been_ available and was uninstalled later? (Revert to > the default transformer and let the filter just bail out with an error > if used? Or disable the filter--if that is even possible with the > current API?) Disable the config, revert to default if custom is unavailable throw an error dialog up with the link to the extensions page for the split off extension I suppose. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - android/experimental sw/source
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 18 --
sw/source/core/layout/paintfrm.cxx
|9 +
2 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 6dc9552e22952f83d9ee16870eae9e1f2a2ca2fa
Author: Tor Lillqvist
Date: Thu Sep 6 17:31:44 2012 +0300
Move Bootstrap setup and lib pre-loading (for easier debugging) to
onCreate()
Change-Id: I77c08dc1236c4c77cfb7711f3be659ebfe877dd1
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index c2ce1d4..c0f4c4d 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -135,7 +135,15 @@ public class LibreOfficeUIActivity extends
SherlockActivity implements ActionBar
currentDirectory = homeDirectory;
//Load default settings
+Bootstrap.setup(this);
+Bootstrap.putenv("SAL_LOG=yes");
+
+// Load a lot of shlibs here explicitly in advance because that
+// makes debugging work better, sigh
+Bootstrap.dlopen("libmergedlo.so");
+Bootstrap.dlopen("libswdlo.so");
+Bootstrap.dlopen("libswlo.so");
}
public void createUI(){
@@ -741,16 +749,6 @@ class ListItemAdapter implements ListAdapter{
long t1 = System.currentTimeMillis();
timingOverhead = t1 - t0;
-Bootstrap.setup(LibreOfficeUIActivity.this);
-
-Bootstrap.putenv("SAL_LOG=yes");
-
-// Load a lot of shlibs here explicitly in advance because
that
-// makes debugging work better, sigh
-Bootstrap.dlopen("libmergedlo.so");
-Bootstrap.dlopen("libswdlo.so");
-Bootstrap.dlopen("libswlo.so");
-
// Log.i(TAG, "Sleeping NOW");
// Thread.sleep(2);
commit 31c1971f8e80a2bf03efef77ba5db32ac7871b12
Author: Tor Lillqvist
Date: Thu Sep 6 17:28:24 2012 +0300
Avoid assertion failure when rendering thumbnails of some pages
Change-Id: I5331ae27d8e492a8094e1904ba3af143c7c1a0e5
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 0af0b44..b3efb88 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4614,6 +4614,15 @@ lcl_MakeBorderLine(SwRect const& rRect,
aEnd.setY(fStartY);
}
+// WHen rendering to very small (virtual) devices, like when producing
+// page thumbnails in a mobile device app, the line geometry can end up
+// bogus (negative width or height), so just ignore such border lines.
+// Otherwise we will run into assertions later in lcl_TryMergeBorderLine()
+// at least.
+if (aEnd.getX() < aStart.getX() ||
+aEnd.getY() < aStart.getY())
+return;
+
double const nExtentLeftStart = (isLeftOrTopBorder == isVertical)
? lcl_GetExtent(pStartNeighbour, 0)
: lcl_GetExtent(0, pStartNeighbour);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddeeac32bf2af605ee6fd140e9a4e5ee45684317 Author: Caolán McNamara Date: Thu Sep 6 15:40:28 2012 +0100 use OUString::startsWith instead of OUString::match Change-Id: I6b88baf83bfce1c28955b445c2c2ddd690cfed2d diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index e74fa03..6dd7053 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -116,7 +116,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN // fdo#54486 lets make sure that the ordinal format and the non-ordinal // format match at the start, so that the expectation can be verified // that there is some trailing "ordinal suffix" which can be extracted -bool bSimpleOrdinalSuffix = sValueWithOrdinal.match(sValueWithNoOrdinal); +bool bSimpleOrdinalSuffix = sValueWithOrdinal.startsWith(sValueWithNoOrdinal); SAL_WARN_IF(!bSimpleOrdinalSuffix, "i18npool", "ordinal " << sValueWithOrdinal << " didn't start with expected " << ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Impress Remote / dbus
On Wed, 2012-09-05 at 11:30 +0200, Andrzej J. R. Hunt wrote: > On 09/04/2012 05:47 PM, Caolán McNamara wrote: > > > 1. Port my code to dbus-glib and always build dbus-glib? Or port my > > > code to dbus-glib and leave everything else as is, meaning bluetooth > > > on Linux needs the user to use --enable-dbus? > > I feel this is the best approach. Except that I'll toggle enable-dbus on > > by default rather than off when I get the chance. done with 4573b628cc1d18bb623a1f64b35ee6e113dcf03f now > I don't think it's too critical to have dbus enabled, but would be > nice to have for 3.7. Yeah, we should sort out whether anyone's got the time to raise the baseline that we use for the universal build. > Would it not be more appropriate to use g_debug rather than g_warning > for these messages True, they shouldn't really be warnings, it no biggy if the services don't exist. Done now as e053f8cb0fc78bae274b74d7fed59d211e5c9f26 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/generic vcl/unx
vcl/generic/fontmanager/fontconfig.cxx |8
vcl/unx/gtk/window/gtkframe.cxx| 18 +-
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit e053f8cb0fc78bae274b74d7fed59d211e5c9f26
Author: Caolán McNamara
Date: Thu Sep 6 15:27:49 2012 +0100
these warnings are only debug informational really
Change-Id: Ie3da4be7251302cb68bd80a65bf74e8bc1b2e5cd
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 26a292c..b164adc 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(PrintFontManager,
autoInstallFontLangSupport)
DBusGConnection *session_connection = dbus_g_bus_get(DBUS_BUS_SESSION,
&error);
if (error != NULL)
{
-g_warning ("DBUS cannot connect : %s", error->message);
+g_debug ("DBUS cannot connect : %s", error->message);
g_error_free (error);
return -1;
}
@@ -880,7 +880,7 @@ IMPL_LINK_NOARG(PrintFontManager,
autoInstallFontLangSupport)
"org.freedesktop.PackageKit.Modify");
if (proxy == NULL)
{
-g_warning("Could not get DBUS proxy: org.freedesktop.PackageKit");
+g_debug("Could not get DBUS proxy: org.freedesktop.PackageKit");
return -1;
}
@@ -897,12 +897,12 @@ IMPL_LINK_NOARG(PrintFontManager,
autoInstallFontLangSupport)
G_TYPE_INVALID);
/* check the return value */
if (!res)
- g_warning("InstallFontconfigResources method failed");
+ g_debug("InstallFontconfigResources method failed");
/* check the error value */
if (error != NULL)
{
-g_warning("InstallFontconfigResources problem : %s", error->message);
+g_debug("InstallFontconfigResources problem : %s", error->message);
g_error_free(error);
}
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index fdbc6de..c159858 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2060,7 +2060,7 @@ dbus_inhibit_gsm (const gchar *appname,
/* get the DBUS session connection */
session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error != NULL) {
-g_warning ("DBUS cannot connect : %s", error->message);
+g_debug ("DBUS cannot connect : %s", error->message);
g_error_free (error);
return -1;
}
@@ -2071,7 +2071,7 @@ dbus_inhibit_gsm (const gchar *appname,
GSM_DBUS_PATH,
GSM_DBUS_INTERFACE);
if (proxy == NULL) {
-g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
+g_debug ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
return -1;
}
@@ -2088,12 +2088,12 @@ dbus_inhibit_gsm (const gchar *appname,
/* check the return value */
if (! res) {
cookie = -1;
-g_warning ("Inhibit method failed");
+g_debug ("Inhibit method failed");
}
/* check the error value */
if (error != NULL) {
-g_warning ("Inhibit problem : %s", error->message);
+g_debug ("Inhibit problem : %s", error->message);
g_error_free (error);
cookie = -1;
}
@@ -2111,14 +2111,14 @@ dbus_uninhibit_gsm (guint cookie)
DBusGConnection *session_connection = NULL;
if (cookie == guint(-1)) {
-g_warning ("Invalid cookie");
+g_debug ("Invalid cookie");
return;
}
/* get the DBUS session connection */
session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error) {
-g_warning ("DBUS cannot connect : %s", error->message);
+g_debug ("DBUS cannot connect : %s", error->message);
g_error_free (error);
return;
}
@@ -2129,7 +2129,7 @@ dbus_uninhibit_gsm (guint cookie)
GSM_DBUS_PATH,
GSM_DBUS_INTERFACE);
if (proxy == NULL) {
-g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
+g_debug ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
return;
}
@@ -2142,12 +2142,12 @@ dbus_uninhibit_gsm (guint cookie)
/* check the return value */
if (! res) {
-g_warning ("Uninhibit method failed");
+g_debug ("Uninhibit method failed");
}
/* check the error value */
if (error != NULL) {
-g_warning ("Uninhibit problem : %s", error->message);
+g_debug ("Uninhibit probl
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/xml/xmlstyli.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 803aac5aafe5597b8a39cf85062a22716e29bb33 Author: Markus Mohrhard Date: Thu Sep 6 15:48:01 2012 +0200 assign correct value (cherry picked from commit 160a88e18d868433813f3f09b340dcaf68f276b2) Signed-off-by: Stephan Bergmann diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 4c99b6d..93e95fe 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -413,7 +413,7 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext( if(!mpCondFormat) mpCondFormat = new ScConditionalFormat( 0, GetScImport().GetDocument() ); ScXMLMapContext* pMapContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName, xAttrList); -pContext = pContext; +pContext = pMapContext; mpCondFormat->AddEntry(pMapContext->CreateConditionEntry()); } if (!pContext) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: sc/inc sc/source
On 09/06/2012 03:52 PM, Markus Mohrhard wrote: 2012/9/6 Stephan Bergmann : On 09/05/2012 05:57 PM, Libreoffice Gerrit user wrote: +pContext = pContext; Should that rather be pContext = pMapContext? Yes, changed in master. Can someone please backport it to 3-6. Done. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 102
1 file changed, 69 insertions(+), 33 deletions(-)
New commits:
commit d344d772fc2490d02efc81bd6a5d155f013efd76
Author: Caolán McNamara
Date: Wed Sep 5 11:31:10 2012 +0100
Resolves: fdo#54486 ensure ordinal format has non-ordinal prefix
Make sure that the ordinal format and the non-ordinal format match at the
start, so that the expectation can be verified that there is some trailing
"ordinal suffix" which can be extracted.
I'm not at all sure that this will be true for all languages.
Change-Id: Ib89a51cdd743db12bfe6e723a9acb61d9fe5e6ce
(cherry picked from commit a05357ab69712bec53c2d8d17efbbf25907ff9b8)
Signed-off-by: Michael Stahl
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index aff018f..a0760a0 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -26,6 +26,7 @@
*
/
+#include
#include
#include
#include "ordinalsuffix.hxx"
@@ -53,6 +54,23 @@ OrdinalSuffix::~OrdinalSuffix()
{
}
+namespace
+{
+OUString mungeUnicodeStringToOUString(const icu::UnicodeString &rIn,
UErrorCode &rCode)
+{
+// Apply NFKC normalization to get normal letters
+icu::UnicodeString normalized;
+icu::Normalizer::normalize(rIn, UNORM_NFKC, 0, normalized, rCode);
+// Convert the normalized UnicodeString to OUString
+OUString sRet = (U_SUCCESS(rCode))
+? OUString(reinterpret_cast(normalized.getBuffer()), normalized.length())
+: OUString();
+// replace any minus signs with hyphen-minus so that negative numbers
+// from the simple number formatter and heavy-duty pattern formatter
+// agree as to their negative number sign
+return sRet.replace(0x2212, '-');
+}
+}
/*
* For this method to properly return the ordinal suffix for other locales
@@ -69,46 +87,64 @@ uno::Sequence< OUString > SAL_CALL
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
CSTR( aLocale.Language ),
CSTR( aLocale.Country ),
CSTR( aLocale.Variant ) );
-icu::RuleBasedNumberFormat formatter(
-icu::URBNF_ORDINAL, rIcuLocale, nCode );
-if ( U_SUCCESS( nCode ) )
+icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale,
nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+boost::scoped_ptr
xNumberFormat(icu::NumberFormat::createInstance(rIcuLocale, nCode));
+if (!U_SUCCESS(nCode))
+return retValue;
+
+icu::UnicodeString sFormatWithNoOrdinal;
+xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+OUString sValueWithNoOrdinal =
mungeUnicodeStringToOUString(sFormatWithNoOrdinal, nCode);
+if (!U_SUCCESS(nCode))
+return retValue;
+
+int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
+for (int32_t i = 0; i < nRuleSets; ++i)
{
-int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
-for ( int32_t i = 0; i < nRuleSets; i++ )
-{
-icu::UnicodeString ruleSet = formatter.getRuleSetName( i );
-// format the string
-icu::UnicodeString icuRet;
-icu::FieldPosition icuPos;
-formatter.format( (int32_t)nNumber, ruleSet, icuRet, icuPos, nCode
);
-
-if ( U_SUCCESS( nCode ) )
-{
-// Apply NFKC normalization to get normal letters
-icu::UnicodeString normalized;
-nCode = U_ZERO_ERROR;
-icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized,
nCode );
-if ( U_SUCCESS( nCode ) )
-{
-// Convert the normalized UnicodeString to OUString
-OUString sValue( reinterpret_cast(
normalized.getBuffer( ) ), normalized.length() );
-
-// Remove the number to get the prefix
-sal_Int32 len = OUString::valueOf( nNumber ).getLength( );
-
-sal_Int32 newLength = retValue.getLength() + 1;
-retValue.realloc( newLength );
-retValue[ newLength - 1 ] = sValue.copy( len );
-}
-}
-}
+icu::UnicodeString ruleSet = formatter.getRuleSetName(i);
+
+// format the string
+icu::UnicodeString sFormatWithOrdinal;
+icu::FieldPosition icuPos;
+formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal,
icuPos, nCode );
+
+if (!U_SUCCESS(nCode))
+continue;
+
+OUString sValueWithOrdinal =
mungeUnicodeStringToOUString(sFormatWithOrdinal, nCode);
+if (!U_SUCCESS(nCode))
+continue;
+
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/xmlstyli.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 160a88e18d868433813f3f09b340dcaf68f276b2 Author: Markus Mohrhard Date: Thu Sep 6 15:48:01 2012 +0200 assign correct value diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 5776d72..27af196 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -411,7 +411,7 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext( if(!mpCondFormat) mpCondFormat = new ScConditionalFormat( 0, GetScImport().GetDocument() ); ScXMLMapContext* pMapContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName, xAttrList); -pContext = pContext; +pContext = pMapContext; mpCondFormat->AddEntry(pMapContext->CreateConditionEntry()); } if (!pContext) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 966c1bd122d8258dd8b1abfe638de7b1ce0d3c98
Author: Caolán McNamara
Date: Wed Sep 5 10:00:37 2012 +0100
fdo#38242: Make autocorrect of 1st to 1 + superscripted st work again
It surely doesn't matter if the result of normalization is unchanged
(cherry picked from commit defe079d455ccc958fd0128e8a8cf0e4aeb5cd9c)
Change-Id: I87dfd0dadee33897f5df4b0dc532166a8bd9d7e5
Signed-off-by: Michael Stahl
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 95e1341..aff018f 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -89,7 +89,7 @@ uno::Sequence< OUString > SAL_CALL
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
icu::UnicodeString normalized;
nCode = U_ZERO_ERROR;
icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized,
nCode );
-if ( U_SUCCESS( nCode ) && ( normalized != icuRet ) )
+if ( U_SUCCESS( nCode ) )
{
// Convert the normalized UnicodeString to OUString
OUString sValue( reinterpret_cast(
normalized.getBuffer( ) ), normalized.length() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3.6 2/3][Libreoffice-qa] [er...@redhat.com: Re: LibreOffice ESC call, Thur Aug 30th - 14:00UTC]
Bjoern Michaelsen píše v St 29. 08. 2012 v 23:05 +0200: > Hi QA, > > we have a late feature fix proposal for 3-6, which would fix: > > https://bugs.freedesktop.org/show_bug.cgi?id=52240 > https://bugs.freedesktop.org/show_bug.cgi?id=52137 > https://bugs.freedesktop.org/show_bug.cgi?id=52288 > > This has been proposed for 3-6 as: > > https://gerrit.libreoffice.org/511 > > It would be great, if the QA team could check the area and features discribed > in the above bugs on a daily build from: > > http://dev-builds.libreoffice.org/daily/ > > of there are any regressions or unwanted sideeffects found. OK, we have two approvals. One more is needed. IMHO, it is definitely a great step forward. We only need to improve the default locale-specific patterns in the future. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bugs 38840+39596: Coverage analysis and static analysis: Whats next ?
On Thu, 2012-09-06 at 13:15 +0200, John Smith wrote:
> Alright, let me see if I understand this one correctly first. You
> basically want people to be able to find out what gets "#define" 'd in
> what rc files ? So for example, you want people to search for
> "FL_RECORD" to discover that that gets defined in
> './sw/source/ui/envelp/mailmrge.hrc" ?
Nope it's worse than that; we want to go from "Export" to:
String STR_PDF_EXPORT
{
Text[ en-US ] = "E~xport";
};
and from there to an opengrok query (?) for STR_PDF_EXPORT in the code.
Of course; we could do this in shell, in a tool in the code if you're
happier with that :-)
ATB,
Michael.
--
michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - cppcanvas/source sd/Library_sd.mk sd/source
cppcanvas/source/mtfrenderer/emfplus.cxx |4 -
sd/Library_sd.mk |2
sd/source/filter/ppt/pptin.cxx |6 --
sd/source/filter/ppt/pptinanimations.cxx | 71 +++
sd/source/filter/ppt/pptinanimations.hxx | 11 ++--
5 files changed, 65 insertions(+), 29 deletions(-)
New commits:
commit 35cbe7206d19afa8d30cb84e9285f45964dbaad8
Author: Radek Doulik
Date: Thu Sep 6 14:41:08 2012 +0200
fixed typo
Change-Id: I483ff930b99d04cbd1514d7f541e57e223b04bab
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 5b9651a..2c028bc 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -753,9 +753,9 @@ namespace cppcanvas
// debug code - write the stream to debug file
/tmp/emf-stream.emf
EMFP_DEBUG(
mfStream.Seek(0);
-static int emfp_debug_stream_numnber = 0;
+static int emfp_debug_stream_number = 0;
rtl::OUString
emfp_debug_filename("/tmp/emf-embedded-stream");
-emfp_debug_filename +=
rtl::OUString::valueOf(emfp_debug_stream_numnber++);
+emfp_debug_filename +=
rtl::OUString::valueOf(emfp_debug_stream_number++);
emfp_debug_filename += rtl::OUString(".emf");
SvFileStream file( emfp_debug_filename, STREAM_WRITE |
STREAM_TRUNC );
commit 764215c901e971ee52e573b54eb79037d6a48f79
Author: Radek Doulik
Date: Thu Sep 6 14:37:34 2012 +0200
try to use old animations when new ones doesn't contain any leave node
- fixes part of n#759172
Change-Id: Id7abecd55edba6dadf16e275192e5251d0a86274
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4dcadc3..876954e 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Library_add_defs,sd,\
))
ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
-$(eval $(call gb_Library_set_defs,sd,\
+$(eval $(call gb_Library_add_defs,sd,\
$$(DEFS) \
-DDBG_ANIM_LOG \
))
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 7415cae..b436632 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -822,8 +822,7 @@ sal_Bool ImplSdPPTImport::Import()
{
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xPage(
pMPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY );
ppt::AnimationImporter
aImporter( this, rStCtrl );
-aImporter.import( xPage,
aProgTagContentHd );
-bNewAnimationsUsed = sal_True;
+bNewAnimationsUsed =
aImporter.import( xPage, aProgTagContentHd ) > 0;
}
break;
}
@@ -940,8 +939,7 @@ sal_Bool ImplSdPPTImport::Import()
{
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xPage(
pPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY );
ppt::AnimationImporter
aImporter( this, rStCtrl );
-aImporter.import( xPage,
aProgTagContentHd );
-bNewAnimationsUsed = sal_True;
+bNewAnimationsUsed =
aImporter.import( xPage, aProgTagContentHd ) > 0;
}
break;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 03e0203..52452d9 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -239,10 +239,16 @@ AnimationImporter::AnimationImporter( ImplSdPPTImport*
pPPTImport, SvStream& rSt
//
-void AnimationImporter::import( const Reference< XDrawPage >& xPage, const
DffRecordHeader& rProgTagContentHd )
+int AnimationImporter::import( const Reference< XDrawPage >& xPage, const
DffRecordHeader& rProgTagContentHd )
{
+int nNodes = 0;
+
#ifdef DBG_ANIM_LOG
-mpFile = fopen( "c:\\output.xml", "w+" );
+static int ppt_anim_debug_stream_number = 1;
+rtl::OUString
ppt_anim_debug_filename("ppt-animation-import-debug-output-");
+ppt_anim_debug_filename +=
rtl::OUString::valueOf(ppt_anim_debug_stream_number++);
+ppt_anim_debug_filename += rtl::OUString("
Re: compareToAscii( RTL_CONSTASCII_STRINGPARAM( "something" ) )
Hi Stephan,
Stephan Bergmann píše v Čt 06. 09. 2012 v 11:12 +0200:
> > I wonder if it makes sense to introduce some kind of CONSTASCII_STRLEN()
> > macro that would make this more obvious, and convert the
> > rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") )
>
> Not sure what you mean here. (And there already is
> RTL_CONSTASCII_LENGTH, btw.)
What I meant was that by a different name, we'd distinguish the (old)
cases where RTL_CONSTASCII_STRINGPARAM() was inevitable in the past
(string construction, or so) from the cases where we are using that just
to count the length to get the "other" meaning of compareToAscii().
But that is a non-issue now when we do have startsWith(), thanks
Lubos! :-)
All the best,
Kendy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extensions/README
extensions/README | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit 08aec05e3388f10e40ef0726661bda0792d78213 Author: Jan Holesovsky Date: Tue Sep 4 05:46:42 2012 +0200 Update with info about online update checking lifetime. Change-Id: I6f631fbf9f9e3e958ab3269d099be42e0854493a diff --git a/extensions/README b/extensions/README index c7f6afa..aefd5b8 100644 --- a/extensions/README +++ b/extensions/README @@ -1 +1,14 @@ -Browser plugin, activex control, scanner bits. +Browser plugin, activex control, scanner bits. Online update. + +== Application online update checking == + +When we start LO, first InitUpdateCheckJobThread is created, via +UpdateCheckJob::execute() (from extensions/source/update/check/updatecheckjob.cxx), +as a reaction to a "onFirstVisibleTask" event. It waits 25 seconds (so that it +does not interfere with the startup itself), and then calls +UpdateCheck::initialize() (from extensions/source/update/check/updatecheck.cxx). + +This creates one more thread, UpdateCheckThread, that regularly checks whether +we have reached the time when we should ask for the update. If yes, asks for +that, and shows the download button in the menu (if the new update is +available). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: compareToAscii( RTL_CONSTASCII_STRINGPARAM( "something" ) )
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Em 06-09-2012 09:01, Lubos Lunak escreveu:
> On Thursday 06 of September 2012, Stephan Bergmann wrote:
>> On 09/06/2012 09:37 AM, Jan Holesovsky wrote:
>>> hunk. In this case, the use of RTL_CONSTASCII_STRINGPARAM() kind of
>>> simulates "startsWith" (that we do not have as a method); ie. for
>>> rQAttributeName == "xmlns:SOMETHING":
>>>
>>> rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") ) ==
>>> 0
>>>
>>> but
>>>
>>> rQAttributeName.compareToAscii( "xmlns:" ) > 0
>>
>> Good catch; and the different semantics of the compareTo... overloads is
>> a horrible gotcha indeed.
> ...
>>> cases to that? Or even better, introduce a startsWith() [or just
>>> startsWithAscii() for the optimized case] method, like we did with the
>>> isEmpty()...
>>
>> Note that "startsWith" is already covered by the various existing
>> match... functions, with a default fromIndex = 0.
>
> Which is rather non-obvious both when writing and reading code,
> as 'str.match( "foo" )' intuitively suggests 'str == "foo"', so it's not
> really good API either. I've had startsWith() on my list for quite a while,
> so I've added it now.
>
Hi I will check startWith() right now on this case.
Thanks
- --
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQSJHeAAoJEJp3R7nH3vLx2iQH/ifpZtSZB3aTbkgBlgjY1g3N
jSrBA+Hwdb+9WfPDjlici6SWzbJPsCR+4s9s+Y0LYmVAERCkMZWKy8OHJJvV2XMy
qG7XAksGph78s9Pt6aky3PE3rkuJkcNIQzjCN9eg7g0QZ7X2lbbM/OEAY6Isxm+G
nzVtR7nEACILn4J3xLeI1RgTh9zAgGE8V1oSze5Ib7zWv3vNagJJO6x+DCwOvBiT
MHbBNKI+wB2uLaKDVFeWtzxGlUO8FhHdmfvTFL9SNvuIFazhJzpmKi5omVkBtt35
i8UjQnikT7BIDBzPX50rB+ExzQXtV8RZiz4ScSKRQ3pzUWuwndzydVqaHazD1E4=
=vhWS
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: compareToAscii( RTL_CONSTASCII_STRINGPARAM( "something" ) )
On Thursday 06 of September 2012, Stephan Bergmann wrote:
> On 09/06/2012 09:37 AM, Jan Holesovsky wrote:
> > hunk. In this case, the use of RTL_CONSTASCII_STRINGPARAM() kind of
> > simulates "startsWith" (that we do not have as a method); ie. for
> > rQAttributeName == "xmlns:SOMETHING":
> >
> > rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") ) ==
> > 0
> >
> > but
> >
> > rQAttributeName.compareToAscii( "xmlns:" ) > 0
>
> Good catch; and the different semantics of the compareTo... overloads is
> a horrible gotcha indeed.
...
> > cases to that? Or even better, introduce a startsWith() [or just
> > startsWithAscii() for the optimized case] method, like we did with the
> > isEmpty()...
>
> Note that "startsWith" is already covered by the various existing
> match... functions, with a default fromIndex = 0.
Which is rather non-obvious both when writing and reading code,
as 'str.match( "foo" )' intuitively suggests 'str == "foo"', so it's not
really good API either. I've had startsWith() on my list for quite a while,
so I've added it now.
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: deb#681185: wait for InternalIPC::ProcessingDone in oosplash
>From Stephan Bergmann : Stephan Bergmann has uploaded a new change for review. Change subject: deb#681185: wait for InternalIPC::ProcessingDone in oosplash .. deb#681185: wait for InternalIPC::ProcessingDone in oosplash Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c (cherry picked from commit 5c804dce946a928adcaf97533f5345b33e688ff5) --- M desktop/unx/source/start.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/569/1 -- To view, visit https://gerrit.libreoffice.org/569 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk sal/inc sal/qa
sal/CppunitTest_sal_rtl_strings.mk |1
sal/inc/rtl/string.hxx | 26
sal/inc/rtl/ustring.hxx | 59 ++
sal/qa/rtl/strings/test_ostring_stringliterals.cxx |5 +
sal/qa/rtl/strings/test_oustring_startswith.cxx | 63
sal/qa/rtl/strings/test_oustring_stringliterals.cxx |2
6 files changed, 156 insertions(+)
New commits:
commit 095ffaf5efef5e8fdc4d7dfa8cd90fff7b768661
Author: LuboÅ¡ LuÅák
Date: Thu Sep 6 13:51:21 2012 +0200
add O(U)String::startsWith() to complement endsWith()
There's match(), with the second argument defaulting to 0, which
does the same, but that's pretty non-obvious.
Change-Id: Idd4de9388f53e1b5dc5d48446d1001af32c0af3d
diff --git a/sal/CppunitTest_sal_rtl_strings.mk
b/sal/CppunitTest_sal_rtl_strings.mk
index b93d644..2762133 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -34,6 +34,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sal_rtl_strings,\
sal/qa/rtl/strings/test_oustring_convert \
sal/qa/rtl/strings/test_oustring_endswith \
sal/qa/rtl/strings/test_oustring_noadditional \
+sal/qa/rtl/strings/test_oustring_startswith \
sal/qa/rtl/strings/test_oustring_stringliterals \
))
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 497e4e3..84ab48e 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -663,6 +663,32 @@ public:
}
/**
+ Check whether this string starts with a given substring.
+
+ @param str the substring to be compared
+
+ @return true if and only if the given str appears as a substring at the
+ start of this string
+
+ @since LibreOffice 3.7
+*/
+bool startsWith(OString const & str) const {
+return match(str, 0);
+}
+
+/**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+ @since LibreOffice 3.7
+*/
+template< typename T >
+typename internal::ConstCharArrayDetector< T, bool >::Type startsWith( T&
literal ) const
+{
+RTL_STRING_CONST_FUNCTION
+return match(literal, 0);
+}
+
+/**
Check whether this string ends with a given substring.
@param str the substring to be compared
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 448f620..3e4e541 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -881,6 +881,65 @@ public:
#endif
/**
+ Check whether this string starts with a given substring.
+
+ @param str the substring to be compared
+
+ @return true if and only if the given str appears as a substring at the
+ start of this string
+
+ @since LibreOffice 3.7
+*/
+bool startsWith(OUString const & str) const {
+return match(str, 0);
+}
+
+/**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+ @since LibreOffice 3.7
+*/
+template< typename T >
+typename internal::ConstCharArrayDetector< T, bool >::Type startsWith( T&
literal ) const
+{
+return rtl_ustr_asciil_reverseEquals_WithLength( pData->buffer,
literal,
+internal::ConstCharArrayDetector< T, void >::size - 1);
+}
+
+/**
+ Check whether this string starts with a given string, ignoring the case
of
+ ASCII letters.
+
+ Character values between 65 and 90 (ASCII A-Z) are interpreted as
+ values between 97 and 122 (ASCII a-z).
+ This function can't be used for language specific comparison.
+
+ @paramstr the object (substring) to be compared.
+ @return true if this string starts with str, ignoring the case of ASCII
+ letters ("A"--"Z" and "a"--"z"); otherwise, false is returned
+ @since LibreOffice 3.7
+*/
+sal_Bool startsWithIgnoreAsciiCase( const OUString & str ) const
SAL_THROW(())
+{
+return matchIgnoreAsciiCase(str, 0);
+}
+
+/**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+ @since LibreOffice 3.7
+*/
+template< typename T >
+typename internal::ConstCharArrayDetector< T, bool >::Type
startsWithIgnoreAsciiCase( T& literal ) const SAL_THROW(())
+{
+return (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+pData->buffer,
+internal::ConstCharArrayDetector< T, void >::size - 1,
literal,
+internal::ConstCharArrayDetector< T, void >::size - 1)
+== 0);
+}
+
+/**
Check whether this string ends with a given substring.
@param str the substring to be compared
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 0f06c3f..877c45e 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl
Re: Bugs 38840+39596: Coverage analysis and static analysis: Whats next ?
On Wed, Sep 5, 2012 at 1:15 PM, Michael Meeks wrote:
>
>
> Of course, if you really don't want to look into / learn that; I had
> another idea that'd be great to get implemented:
>
> https://bugs.freedesktop.org/show_bug.cgi?id=39439
>
Alright, let me see if I understand this one correctly first. You
basically want people to be able to find out what gets "#define" 'd in
what rc files ? So for example, you want people to search for
"FL_RECORD" to discover that that gets defined in
'./sw/source/ui/envelp/mailmrge.hrc" ?
If that is true, I guess I could work on a shell script that does
something like this :
find /usr/local/src/libreoffice -name \*.\?rc -exec grep "FL_RECORD" {} \;
of course, those searches will take a while and will have to be
executed on the Linux cmd prompt, so that will be no good for Windows
users.
But again, I feel things similar to this must have been done before
elsewhere. Arent there program around that tell you what gets #define
'd in which /usr/include header files ? Dont some IDE's even do stuff
like that for you automagically ? Surely it would be far easier to
modify such logic to work on those *.?rc files than to start from
scratch completely ?
- John Smith.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/start.c | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 5c804dce946a928adcaf97533f5345b33e688ff5
Author: Stephan Bergmann
Date: Thu Sep 6 12:43:54 2012 +0200
deb#681185: wait for InternalIPC::ProcessingDone in oosplash
Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 2ecb779..f1e872e 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -512,6 +512,17 @@ send_args( int fd, rtl_uString *pCwdPath )
nLen = rtl_string_getLength( pOut ) + 1;
bResult = ( write( fd, rtl_string_getStr( pOut ), nLen ) == (ssize_t) nLen
);
+if ( bResult )
+{
+char resp[ strlen( "InternalIPC::ProcessingDone" ) ];
+ssize_t n = read( fd, resp, SAL_N_ELEMENTS( resp ) );
+bResult = n == (ssize_t) SAL_N_ELEMENTS( resp )
+&& (memcmp(
+resp, "InternalIPC::ProcessingDone",
+SAL_N_ELEMENTS( resp ) )
+== 0);
+}
+
/* cleanup */
rtl_uString_release( pEscapedCwdPath );
rtl_uString_release( pBuffer );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REPOST] Control elements in a partially formal document
Hi All, sometimes applications are used in way different from that they were originally designed for and this might be one of the cases. For reports on analysis in mechanics, libreoffice is connected to a FEM system (https://en.wikipedia.org/wiki/Finite_element_method), both to receive pictures and tables from it as well as to feed parameters mentioned in the document to it and to control (re)doing calculations. The overall contruction is a more common use and could loosely be described as a partial-formal document, i.e. one, in which certain parts have highly defined formal structure that could be described by means of data types together with operations on them. These parts are embedded in and distributed over the document. Now to my question. We're currently renew the application and i write to learn if new means to improve the user interface became available for this task. For now we're using the following elements: a) Menu entries to trigger actions b) The cursor position c) (I think) The right mouse button menu on frames around some pictures. What i'm looking for, are means for a more fine grane control. E.g. the formalized part of the document requieres certain rubrics, i.e. sections, subsections, etc. A user control element that could be of use with such would be: a) To be able to cheaply recognize that the cursor is in such title. b) To offer extra control, e.g. right mouse button menu c) to change the cursor or otherwise indicate special features. Some years ago, we looked over the full API for such opportunities, but found only the few currently used and some, too low-level IMHO, in the accessibility branch. As a related topic aside, i'm aware that the idea, that libreoffice has about the structure of a document becomes more weaker, the more one drives apart from raw layout. Technically, this general problem is well-addressed in XML via name spaces. Thus my second question about means to add to the documents idea of structure. Please, if i write to the wrong mail-list, help me to find the right one. Kind regards Lars Dölle ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sw/source
sw/source/core/crsr/crsrsh.cxx | 11 +
sw/source/ui/docvw/HeaderFooterWin.cxx | 11 -
sw/source/ui/docvw/edtwin.cxx | 72 -
sw/source/ui/inc/HeaderFooterWin.hxx |1
sw/source/ui/inc/edtwin.hxx|1
sw/source/ui/wrtsh/wrtsh1.cxx |6 +-
6 files changed, 68 insertions(+), 34 deletions(-)
New commits:
commit 3632b3a01fa8ad5f111658ff5cea555db58637fd
Author: Cédric Bosdonnat
Date: Mon Aug 27 18:12:00 2012 +0200
Headers/Footers: don't create temporary parts of document (perf problems)
Clicking on an empty header/footer only displays the separator as
creating empty header/footer could cause important layout recomputing on
long documents.
Change-Id: I800c5dd27744772833dee0da4269e7591bd0a10b
Signed-off-by: Petr Mladek
Signed-off-by: Michael Stahl
Signed-off-by: Rainer Bielefeld
Signed-off-by: Roman Eisele
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index dfd80d9..ca62c55 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -690,6 +690,17 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool
bOnlyText, bool bBlock )
bool bInHeaderFooter = pFrm && ( pFrm->IsHeaderFrm() ||
pFrm->IsFooterFrm() );
if ( bInHeaderFooter != IsHeaderFooterEdit() )
ToggleHeaderFooterEdit();
+else
+{
+// Make sure we have the proper Header/Footer separators shown
+// as these may be changed if clicking on an empty Header/Footer
+SetShowHeaderFooterSeparator( Header, pFrm != NULL &&
pFrm->IsHeaderFrm( ) );
+SetShowHeaderFooterSeparator( Footer, pFrm != NULL &&
pFrm->IsFooterFrm( ) );
+
+// Repaint everything
+GetWin()->Invalidate();
+}
+
if( pBlockCrsr && bBlock )
{
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index a6b09dd..dd58e44 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1316,13 +1316,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
rSh.IsHeaderFooterEdit( ) )
{
bool bHeader = FRMTYPE_HEADER & rSh.GetFrmType(0,sal_False);
-
-// Remove the temporary header/footer
-if ( !m_sTmpHFPageStyle.isEmpty() )
-{
-rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader,
false, false );
-}
-
if ( bHeader )
rSh.SttPg();
else
@@ -1330,10 +1323,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
rSh.ToggleHeaderFooterEdit();
}
-// If we are inputing a key in a temporary header/footer, then make it
definitive
-if ( !m_sTmpHFPageStyle.isEmpty( ) )
-m_sTmpHFPageStyle = rtl::OUString( );
-
SfxObjectShell *pObjSh =
(SfxObjectShell*)rView.GetViewFrame()->GetObjectShell();
if ( bLockInput || (pObjSh && pObjSh->GetProgress()) )
// When the progress bar is active or a progress is
@@ -2679,26 +2668,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
-FrameControlType eControl;
-bool bIsInHF = IsInHeaderFooter( aDocPos, eControl );
-if ( !m_sTmpHFPageStyle.isEmpty( ) )
-{
-// Are we clicking outside the temporary header/footer? if so remove it
-rtl::OUString sStyleName = rSh.GetCurPageStyle( false );
-bool bMatchesTmpHF = sStyleName == m_sTmpHFPageStyle &&
-( ( m_bTmpHFIsHeader && eControl == Header ) ||
- ( !m_bTmpHFIsHeader && eControl == Footer ) );
-
-if ( ( !bIsInHF && rSh.IsHeaderFooterEdit( ) ) || !bMatchesTmpHF )
-rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader,
false, false );
-
-m_sTmpHFPageStyle = rtl::OUString( );
-}
-
// Are we clicking on a blank header/footer area?
-if ( bIsInHF && !rSh.IsHeaderFooterEdit( ) )
+FrameControlType eControl;
+if ( IsInHeaderFooter( aDocPos, eControl ) )
{
-// Create empty header/footer under the cursor and switch to it
const SwPageFrm* pPageFrm = rSh.GetLayout()->GetPageAtPos( aDocPos );
// Is it active?
@@ -2719,10 +2692,25 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
if ( !bActive )
{
-const String& rStyleName = pPageFrm->GetPageDesc()->GetName();
-rSh.ChangeHeaderOrFooter( rStyleName, eControl == Header, true,
false );
-m_sTmpHFPageStyle = rStyleName;
-m_bTmpHFIsHeader = eControl == Header;
+SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
+bool bWasInHeader = aPam.GetPoint( )->nNode.GetNode(
).FindHeaderStartNode( ) != NULL;
+bool bWasInFooter = aPam.GetPoint( )->nNode.GetNode(
).FindFooterStartNode( ) != NULL;
+
+// Is the cursor in a part like similar to the one we click
[Libreoffice-commits] .: 2 commits - configure.in i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk i18npool/Module_i18npool.mk i18npool/qa
configure.in| 50 ++--- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 35 ++ i18npool/Module_i18npool.mk |1 i18npool/qa/cppunit/test_breakiterator.cxx |2 i18npool/qa/cppunit/test_ordinalsuffix.cxx | 102 5 files changed, 171 insertions(+), 19 deletions(-) New commits: commit 4573b628cc1d18bb623a1f64b35ee6e113dcf03f Author: Caolán McNamara Date: Thu Sep 6 10:34:03 2012 +0100 default to enabling dbus on supported platforms Change-Id: I47eac02bf2c0ee7b973d73ac78ae08f9e93f0b42 diff --git a/configure.in b/configure.in index 1c5e630..754c79d 100644 --- a/configure.in +++ b/configure.in @@ -244,6 +244,7 @@ dnl === test_randr=yes test_xrender=yes test_cups=yes +test_dbus=yes test_fontconfig=yes test_cairo=yes @@ -327,6 +328,7 @@ cygwin*|interix*|mingw32*) # tool-chain that is used). test_cups=no +test_dbus=no test_randr=no test_xrender=no test_freetype=no @@ -359,6 +361,7 @@ darwin*) # Mac OS X or iOS test_xrender=no test_freetype=no test_fontconfig=no +test_dbus=no if test "$host_cpu" = "arm"; then _os=iOS test_gtk=no @@ -454,6 +457,7 @@ linux-android*) build_gstreamer=no build_gstreamer_0_10=no test_cups=no +test_dbus=no test_fontconfig=no test_freetype=no test_gtk=no @@ -843,10 +847,10 @@ AC_ARG_ENABLE(opengl, ,enable_opengl=yes) AC_ARG_ENABLE(dbus, -AS_HELP_STRING([--enable-dbus], +AS_HELP_STRING([--disable-dbus], [Determines whether to enable features that depend on dbus. - e.g. Presentation mode screensaver control and auto font install under GNOME via DBUS.]), -,enable_dbus=no) + e.g. Presentation mode screensaver control, auto font install, bluetooth presentation control]) +,enable_dbus=yes) AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf], @@ -4054,6 +4058,7 @@ if test "$enable_headless" = "yes"; then test_randr=no test_xrender=no test_cups=no +test_dbus=no test_fontconfig=yes test_gtk=no build_gstreamer=no @@ -9194,15 +9199,36 @@ AC_SUBST(GNOMEVFS_CFLAGS) AC_SUBST(ENABLE_GNOMEVFS) dnl === +dnl check for dbus support +dnl === +ENABLE_DBUS="" +DBUS_CFLAGS="" +DBUS_LIBS="" + +if test "$enable_dbus" = "no"; then +test_dbus=no +fi + +AC_MSG_CHECKING([whether to enable DBUS support]) +if test "$test_dbus" = "yes"; then +ENABLE_DBUS="TRUE" +AC_MSG_RESULT([yes]) +PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.70) +else +AC_MSG_RESULT([no]) +fi + +AC_SUBST(ENABLE_DBUS) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) + +dnl === dnl Check whether the gtk 2.0 libraries are available. dnl === GTK_CFLAGS="" GTK_LIBS="" ENABLE_SYSTRAY_GTK="" -ENABLE_DBUS="" -DBUS_CFLAGS="" -DBUS_LIBS="" if test "$test_gtk" = "yes"; then if test "$ENABLE_GTK" = "TRUE"; then @@ -9221,15 +9247,6 @@ if test "$test_gtk" = "yes"; then [ENABLE_GTK_PRINT="TRUE"], [ENABLE_GTK_PRINT=""]) -AC_MSG_CHECKING([whether to enable DBUS support]) -if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then -ENABLE_DBUS="TRUE" -AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( DBUS, dbus-glib-1 >= 0.70 ) -else -AC_MSG_RESULT([no]) -fi - AC_MSG_CHECKING([whether to enable GIO support]) if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then if test "$ENABLE_GNOMEVFS" = "TRUE"; then @@ -9246,14 +9263,11 @@ fi AC_SUBST(ENABLE_GIO) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -AC_SUBST(ENABLE_DBUS) AC_SUBST(ENABLE_SYSTRAY_GTK) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(GTHREAD_CFLAGS) AC_SUBST(GTHREAD_LIBS) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) AC_SUBST([ENABLE_GTK_PRINT]) AC_SUBST([GTK_PRINT_CFLAGS]) AC_SUBST([GTK_PRINT_LIBS]) commit ca00d27e33b187a9be36cad93bdaf662b5c221ea Author: Caolán McNamara Date: Thu Sep 6 10:09:32 2012 +0100 Related: fdo#54486 add some regression tests for ordinal suffixes Change-Id: Iea51d777c3cc1fdc58fa7fccfe01e4e8394e79b2 diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk new file mode 100644 index 000..68e5076 --- /dev/null +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -0,0 +1,35 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This So
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 fabien.mic...@hespul.org changed: What|Removed |Added Depends on||46271 --- Comment #110 from fabien.mic...@hespul.org 2012-09-06 10:10:40 UTC --- Bug 46271 : Scrollbar unusable on large documents on Mac OS. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/core/data/conditio.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 5fc1d590e7e57b15eab64770880a52e44c5cca71
Author: Stephan Bergmann
Date: Thu Sep 6 11:49:28 2012 +0200
warning C4702: unreachable code
Change-Id: Ie9544ef452d7b9852bd2c31af1cb42035e5c827b
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 5a0c483..8fddfe5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -63,7 +63,6 @@ bool ScFormatEntry::operator==( const ScFormatEntry& r ) const
{
case condformat::CONDITION:
return static_cast(*this) ==
static_cast(r);
-break;
default:
// TODO: implement also this case
// actually return false for these cases is not that bad
@@ -71,8 +70,6 @@ bool ScFormatEntry::operator==( const ScFormatEntry& r ) const
// to think about the range
return false;
}
-
-return true;
}
bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16
nRecursion = 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
| 20 +-
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
| 32 +-
android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
| 13 ++--
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 17 +
4 files changed, 59 insertions(+), 23 deletions(-)
New commits:
commit 9382fa6ce2fedad19742688d32d0981335c7dd21
Author: Andrzej J.R. Hunt
Date: Thu Sep 6 11:35:30 2012 +0200
Automatically enable/disable bluetooth as necessary for
searching/connection.
Change-Id: Ie7a11c05cf1ba6181e955a65ebef03117c956f1a
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index 4e9ff2a..dc1d6d0 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -25,14 +25,22 @@ import android.support.v4.content.LocalBroadcastManager;
*/
public class BluetoothClient extends Client {
+private boolean mBluetoothWasEnabled;
+private BluetoothAdapter mAdapter;
+
public BluetoothClient(Server aServer,
CommunicationService aCommunicationService) {
super(aServer, aCommunicationService);
try {
-BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
-BluetoothDevice aDevice = aAdapter.getRemoteDevice(aServer
+mAdapter = BluetoothAdapter.getDefaultAdapter();
+mBluetoothWasEnabled = mAdapter.isEnabled();
+if (!mBluetoothWasEnabled) {
+mAdapter.enable();
+}
+
+BluetoothDevice aDevice = mAdapter.getRemoteDevice(aServer
.getAddress());
-aAdapter.cancelDiscovery();
+mAdapter.cancelDiscovery();
BluetoothSocket aSocket = aDevice
.createRfcommSocketToServiceRecord(UUID
.fromString("1101--1000-8000-00805F9B34FB"));
@@ -115,5 +123,11 @@ public class BluetoothClient extends Client {
//}
}
+protected void onDisconnect() {
+if (!mBluetoothWasEnabled) {
+mAdapter.disable();
+}
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
index dedce23..e55f264 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
@@ -31,12 +31,10 @@ public class BluetoothFinder {
if (mAdapter == null) {
return; // No bluetooth adapter found (emulator, special devices)
}
-System.out.println("BT:Discovery starting");
IntentFilter aFilter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
aFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+aFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
mContext.registerReceiver(mReceiver, aFilter);
-
-mAdapter.enable();
mAdapter.startDiscovery();
}
@@ -62,31 +60,35 @@ public class BluetoothFinder {
@Override
public void onReceive(Context context, Intent aIntent) {
-// TODO Auto-generated method stub
if (aIntent.getAction().equals(BluetoothDevice.ACTION_FOUND)) {
+System.out.println("Found");
BluetoothDevice aDevice = (BluetoothDevice) aIntent.getExtras()
.get(BluetoothDevice.EXTRA_DEVICE);
Server aServer = new Server(Protocol.BLUETOOTH,
aDevice.getAddress(), aDevice.getName(),
System.currentTimeMillis());
mServerList.put(aServer.getAddress(), aServer);
-System.out.println("Added " + aServer.getName());
-System.out.println("Now we have: " + mServerList.size());
Intent aNIntent = new Intent(
CommunicationService.MSG_SERVERLIST_CHANGED);
LocalBroadcastManager.getInstance(mContext).sendBroadcast(
aNIntent);
} else if (aIntent.getAction().equals(
-BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
+BluetoothAdapter.ACTION_DISCOVERY_FINISHED)
+|| aIntent.getAction()
+
[PUSHED] offapi: move css.ui.UICommandDescription to css.frame.UIComm...
>From Stephan Bergmann : Stephan Bergmann has submitted this change and it was merged. Change subject: offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription: .. offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription: The service implementation used "com.sun.star.frame.UICommandDescription" since forever, so the IDL file was essentially wrong documentation. But since 7a464263cc5c2ca2b7128734ff4860e02d662818 converted the service to new-style, it cannot be instantated any more and e.g. clicking on Tools->Customize crashes. (Adapting the implementation instead would be an incompatible change.) Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5 --- M cui/source/customize/acccfg.cxx M cui/source/customize/cfg.cxx M cui/source/customize/cfgutil.cxx M cui/source/customize/selector.cxx M dbaccess/source/ui/control/opendoccontrols.cxx M desktop/source/app/app.cxx M desktop/source/migration/migration.cxx M forms/source/helper/commanddescriptionprovider.cxx M framework/source/lomenubar/FrameHelper.cxx M offapi/UnoApi_offapi.mk R offapi/com/sun/star/frame/UICommandDescription.idl M sd/source/ui/dlg/dlgass.cxx M sd/source/ui/view/ViewShellBase.cxx M sfx2/source/dialog/recfloat.cxx M sfx2/source/dialog/templdlg.cxx M sfx2/source/view/viewsh.cxx M svtools/source/uno/contextmenuhelper.cxx M sw/source/ui/lingu/olmenu.cxx 18 files changed, 51 insertions(+), 36 deletions(-) -- To view, visit https://gerrit.libreoffice.org/567 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Michael Stahl Gerrit-Reviewer: Stephan Bergmann ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source dbaccess/source desktop/source forms/source framework/source offapi/com offapi/UnoApi_offapi.mk sd/source sfx2/source svtools/source sw/source
cui/source/customize/acccfg.cxx|5 + cui/source/customize/cfg.cxx |5 + cui/source/customize/cfgutil.cxx |5 + cui/source/customize/selector.cxx |5 + dbaccess/source/ui/control/opendoccontrols.cxx |4 - desktop/source/app/app.cxx |5 + desktop/source/migration/migration.cxx |6 +- forms/source/helper/commanddescriptionprovider.cxx |4 - framework/source/lomenubar/FrameHelper.cxx |4 - offapi/UnoApi_offapi.mk|2 offapi/com/sun/star/frame/UICommandDescription.idl | 56 + offapi/com/sun/star/ui/UICommandDescription.idl| 56 - sd/source/ui/dlg/dlgass.cxx|5 + sd/source/ui/view/ViewShellBase.cxx|5 + sfx2/source/dialog/recfloat.cxx|4 - sfx2/source/dialog/templdlg.cxx|5 + sfx2/source/view/viewsh.cxx|5 + svtools/source/uno/contextmenuhelper.cxx |5 + sw/source/ui/lingu/olmenu.cxx |7 +- 19 files changed, 104 insertions(+), 89 deletions(-) New commits: commit 6a1c29d7efd505346d4b43ee2b7080e8d769301e Author: Michael Stahl Date: Wed Sep 5 22:46:40 2012 +0200 offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription: The service implementation used "com.sun.star.frame.UICommandDescription" since forever, so the IDL file was essentially wrong documentation. But since 7a464263cc5c2ca2b7128734ff4860e02d662818 converted the service to new-style, it cannot be instantated any more and e.g. clicking on Tools->Customize crashes. (Adapting the implementation instead would be an incompatible change.) Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5 diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 957eb38..8ed9d6c 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include @@ -852,7 +852,8 @@ void SfxAcceleratorConfigPage::InitAccCfg() // no - initialize this instance m_xSMGR = ::comphelper::getProcessServiceFactory(); -m_xUICmdDescription = css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()); +m_xUICmdDescription = css::frame::UICommandDescription::create( +comphelper::ComponentContext(m_xSMGR).getUNOContext()); // get the current active frame, which should be our "parent" // for this session diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 0a0e706..626a25d 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -75,7 +75,7 @@ #include #include #include -#include +#include #include #include #include @@ -914,7 +914,8 @@ SaveInData::SaveInData( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNameAccess( - css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xServiceManager).getUNOContext()) ); +css::frame::UICommandDescription::create( +comphelper::ComponentContext(m_xServiceManager).getUNOContext()) ); xNameAccess->getByName( aModuleId ) >>= m_xCommandToLabelMap; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 44cd36b..0f08675 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "acccfg.hrc" #include "helpid.hrc" @@ -586,7 +586,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul m_xGlobalCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xSMGR->createInstance(SERVICE_UICATEGORYDESCRIPTION), css::uno::UNO_QUERY_THROW); m_xModuleCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xGlobalCategoryInfo->getByName(m_sModuleLongName) , css::uno::UNO_QUERY_THROW); -m_xUICmdDescription = css::ui::UICommandDescription::create(::comphelper::ComponentContext(m_xSMGR).getUNOContext()); +m_xUICmdDescription = css::frame::UICommandDescription::create( +::comphelper::ComponentContext(m_xSMGR).getUNOContext()); InitModule(); InitBasic(); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 8ccafd2..280393a 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -62,7 +62,7 @@ #include #include #include -#include +#include using ::rtl::OUString; using namespace ::com::sun::star; @@ -425,7 +425,8 @@ void SvxConfigGroupListB
Re: compareToAscii( RTL_CONSTASCII_STRINGPARAM( "something" ) )
On 09/06/2012 09:37 AM, Jan Holesovsky wrote:
hunk. In this case, the use of RTL_CONSTASCII_STRINGPARAM() kind of
simulates "startsWith" (that we do not have as a method); ie. for
rQAttributeName == "xmlns:SOMETHING":
rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") ) == 0
but
rQAttributeName.compareToAscii( "xmlns:" ) > 0
Good catch; and the different semantics of the compareTo... overloads is
a horrible gotcha indeed.
I wonder if it makes sense to introduce some kind of CONSTASCII_STRLEN()
macro that would make this more obvious, and convert the
rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") )
Not sure what you mean here. (And there already is
RTL_CONSTASCII_LENGTH, btw.)
cases to that? Or even better, introduce a startsWith() [or just
startsWithAscii() for the optimized case] method, like we did with the
isEmpty()...
Note that "startsWith" is already covered by the various existing
match... functions, with a default fromIndex = 0.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 50509, which changed state. Bug 50509 Summary: Language selection is not possible with silent install https://bugs.freedesktop.org/show_bug.cgi?id=50509 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 50509, which changed state. Bug 50509 Summary: Language selection is not possible with silent install https://bugs.freedesktop.org/show_bug.cgi?id=50509 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/inc/RemoteServer.hxx | 14
sd/source/ui/remotecontrol/Server.cxx | 39 --
2 files changed, 25 insertions(+), 28 deletions(-)
New commits:
commit c4380fd9f2e7ebe0687cf979fba3044a5b3df554
Author: Andrzej J.R. Hunt
Date: Thu Sep 6 09:55:38 2012 +0200
Moved all internal details for ClientInfo out of the header.
Change-Id: I64102536f12875b9834ce99763925f1544a87e8f
diff --git a/sd/source/ui/inc/RemoteServer.hxx
b/sd/source/ui/inc/RemoteServer.hxx
index c64bf94..75b350e 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -51,19 +51,7 @@ namespace sd
mAddress( rAddress ) {}
};
-struct ClientInfoInternal:
-ClientInfo
-{
-BufferedStreamSocket *mpStreamSocket;
-rtl::OUString mPin;
-
-ClientInfoInternal( const rtl::OUString rName,
-const rtl::OUString rAddress,
-BufferedStreamSocket *pSocket, rtl::OUString rPin
):
-ClientInfo( rName, rAddress ),
-mpStreamSocket( pSocket ),
-mPin( rPin ) {}
-};
+struct ClientInfoInternal;
class RemoteServer : public salhelper::Thread
{
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 487a543..27dc20c 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -40,18 +40,25 @@ using rtl::OString;
using namespace ::osl;
using namespace ::comphelper;
-// struct ClientInfoInternal:
-// ClientInfo
-// {
-// osl::StreamSocket mStreamSocket;
-// rtl::OUString mPin;
-// ClientInfoInternal( const rtl::OUString rName,
-// const rtl::OUString rAddress,
-// osl::StreamSocket &rSocket, rtl::OUString rPin ):
-// ClientInfo( rName, rAddress ),
-// mStreamSocket( rSocket ),
-// mPin( rPin ) {}
-// };
+namespace sd {
+/**
+ * Used to keep track of clients that have attempted to connect, but
haven't
+ * yet been approved.
+ */
+struct ClientInfoInternal:
+ClientInfo
+{
+BufferedStreamSocket *mpStreamSocket;
+rtl::OUString mPin;
+
+ClientInfoInternal( const rtl::OUString rName,
+const rtl::OUString rAddress,
+BufferedStreamSocket *pSocket, rtl::OUString rPin
):
+ClientInfo( rName, rAddress ),
+mpStreamSocket( pSocket ),
+mPin( rPin ) {}
+};
+}
RemoteServer::RemoteServer() :
Thread( "RemoteServerThread" ),
@@ -72,11 +79,13 @@ void RemoteServer::execute()
if ( !mSocket.bind( aAddr ) )
{
// Error binding
+return;
}
if ( !mSocket.listen(3) )
{
// Error listening
+return;
}
while ( true )
{
@@ -108,6 +117,7 @@ void RemoteServer::execute()
mAvailableClients.push_back( pClient );
// Read off any additional non-empty lines
+// We know that we at least have the empty termination line to
read.
do
{
pSocket->readLine( aLine );
@@ -126,10 +136,9 @@ void RemoteServer::execute()
OUString sPin;
axPin >>= sPin;
-if ( ! sPin.equals( pClient->mPin ) ) {
-break;
+if ( sPin.equals( pClient->mPin ) ) {
+connectClient( pClient, sPin );
}
-connectClient( pClient, sPin );
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bugs 38840+39596: Coverage analysis and static analysis: Whats next ?
On Wed, 2012-09-05 at 14:23 +0200, John Smith wrote: > Well I did just order O'Reilly's 'Head First Programming: A Learner's > Guide to Programming Using the Python Language', so perhaps Ill > finally get myself to learn how to code now. Heh - really, enough thinking and trial and error focused on a single problem will solve it regardless of skill IMHO, and the next similar problem will be much easier to solve. I would recommend learning programming by reading existing code and tweaking it - rather than writing noddy and uninteresting examples :-) it really is a 'better way' IMHO. eg. learning to write compelling novels by a succession of writing our own small novelets (without feedback) seems an un-promising way to learn to program, though sadly commonplace in programming books & courses. > > https://bugs.freedesktop.org/show_bug.cgi?id=39439 > > > > That is a webby / scripty / build-a-database-from-the-code type > > scripting task that would really help people get stuck into coding more > > quickly I think - any bites ? :-) > > > Oof... You call that one an 'EasyHack' ? Surely there must be some > software out there already that enables you to efficiently > search/browse a codebase and/or API / etc ? For example, doesnt > 'doxygen' do what you want here ? Nope; the way the UI resources couple to the code is reasonably peculiar to LibreOffice and requires custom tooling. :-) Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: JAXTHelper vs LibXSLTTransformer, which one is preferred?
Hi, On Wed, Sep 05, 2012 at 03:18:36PM +0200, Peter Jentsch wrote: > Splitting the Saxon stuff should be possible and has been one of the goals of > the libxslt port. I haven't tested that, though. I tried to do the first step--building the java transformer as an extension--a couple of weeks ago, but stopped when I could not get it registered by the pkg manager (I had better/more interesting things to do at the time, so I did not try very hard :-) I am going to give it another try soon. Or I can send the patch to you and forget all about it (that would be my preferred solution :-) Anyway, I think there are going to be code changes needed. Some problems that need to be addressed: the XSLT filter configuration dialog allows to say that the java transformer should be used. But what if it is not available? (Disable the config. item? But the filter will not work...) What if it _had been_ available and was uninstalled later? (Revert to the default transformer and let the filter just bail out with an error if used? Or disable the filter--if that is even possible with the current API?) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Closing bugs in bugzilla: fixed in master or fixed everywhere?
Hi, On Wed, Sep 05, 2012 at 10:46:24AM +0200, Lionel Elie Mamane wrote: > I'd like to check if maybe I misunderstood our bugzilla handling > standards. > > I thought we close the bug when the fix is committed in all branches > where it should be, and that's what I was doing in the bugs I was > fixing. > > But obviously, if our community standards are the other way round, > I'll follow them. > > > I asked because I have now lived several times now that several > developers close a bug I'm CCed to as soon as they commit the fix to > master. To me, RESOLVED/FIXED means simply "the bug is fixed". Which it is as soon as I push the fix into master. > > The disadvantage of the latter method is that these bugs appear > crossed out in the "most annoying" (and other) lists. > > Its advantage, maybe, is that it goes away from said developer's > list: their job is "finished" so it should get the hell out of their > TODO list. Right. Because the next step, review of my proposed fix for inclusion in older branch(es), depends on _other_ developers. > > I've come to see this last point as not completely obvious, and maybe > even wrong: when I commit a fix to master, I regard it as also my job > to get it backported to the other branches, Nobody has claimed otherwise. > so my job on this bug is > _not_ finished, so it makes sense for it to linger in my TODO list > until the fix is everywhere it should. > But this part is handled separately from bugzilla, via the ML (or gerrit). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ccache for windows
Hi Mat, Mat M píše v St 05. 09. 2012 v 23:25 +0200: > ccache for windows under cygwin is working. That's a fact. > ccache is provided as a binary in the dev-tools repo. > As provided by kendy on > http://artax.karlin.mff.cuni.cz/~kendy/blog/archives/monthly/2011-04.html, > I set it and my config_host.mk confirmed it. Glad to hear it still works :-) > But is it normal that ccache on 3.6 branch only uses 3Gb ? I find it very > low, compared to all binary files produced. > > Could someone on linux give its ccache stats to compare ? > Kendy, what's your opinion ? I think the best would be to check the content of your ccache dir, and see if there are new files appearing there. You can also look at the content of the new files, if they look ~reasonably - IIRC I cache even the stdout/stderr for the dependency output. I don't have any starts at hand at the moment, but should you need any more details, please let me know :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
compareToAscii( RTL_CONSTASCII_STRINGPARAM( "something" ) )
Hi Olivier,
Thank you a lot for the OUString cleanups, like
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c75af8578d921040e1baf8414edd7239969bcd45
One thing I noticed is the
@@ -606,8 +596,7 @@ void DocumentHandlerImpl::startElement(
{
OUString const & rQAttributeName = pQNames[ nPos ];
OSL_ENSURE(
- rQAttributeName.compareToAscii(
- RTL_CONSTASCII_STRINGPARAM("xmlns:") ) != 0,
+ rQAttributeName.compareToAscii( "xmlns:" ) != 0,
"### unexpected xmlns!" );
// collect attribute's uid and current prefix
hunk. In this case, the use of RTL_CONSTASCII_STRINGPARAM() kind of
simulates "startsWith" (that we do not have as a method); ie. for
rQAttributeName == "xmlns:SOMETHING":
rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") ) == 0
but
rQAttributeName.compareToAscii( "xmlns:" ) > 0
I wonder if it makes sense to introduce some kind of CONSTASCII_STRLEN()
macro that would make this more obvious, and convert the
rQAttributeName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("xmlns:") )
cases to that? Or even better, introduce a startsWith() [or just
startsWithAscii() for the optimized case] method, like we did with the
isEmpty()...
Can you please check your previous commits for this kind of change, and
re-introduce RTL_CONSTASCII_STRINGPARAM() in compareToAscii for now?
Thank you a lot,
Kendy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: sc/inc sc/source
On 09/05/2012 05:57 PM, Libreoffice Gerrit user wrote:
commit bedbb471c3f49e0860dd63b17c1faeee837096ae
Author: Markus Mohrhard
Date: Mon Sep 3 19:30:26 2012 +0200
better import of conditional format from old ODF structure
The old ODF storage is style based and so the sam cond format can be
divided up into several single stlyes which resulted in several new
style cond formats.
Now we check for old stlye cond formats if there is a equal cond format
and in this case just extend the area. This should make it easier to
transform old documents into the new range based cond formats.
Change-Id: I51a5148922e19e6860de9915abfc59d49b18d96e
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 1ef7cda..5776d72 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -492,13 +408,11 @@ SvXMLImportContext
*XMLTableStyleContext::CreateChildContext(
if( (XML_NAMESPACE_STYLE == nPrefix) &&
IsXMLToken(rLocalName, XML_MAP ) )
{
-pContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName,
xAttrList);
-
-ScXMLMapContent aMap;
-aMap.sCondition = ((ScXMLMapContext*)pContext)->GetCondition();
-aMap.sApplyStyle = ((ScXMLMapContext*)pContext)->GetApplyStyle();
-aMap.sBaseCell = ((ScXMLMapContext*)pContext)->GetBaseCell();
-aMaps.push_back(aMap);
+if(!mpCondFormat)
+mpCondFormat = new ScConditionalFormat( 0,
GetScImport().GetDocument() );
+ScXMLMapContext* pMapContext = new ScXMLMapContext(GetImport(),
nPrefix, rLocalName, xAttrList);
+pContext = pContext;
Should that rather be pContext = pMapContext?
Stephan
+mpCondFormat->AddEntry(pMapContext->CreateConditionEntry());
}
if (!pContext)
pContext = XMLPropStyleContext::CreateChildContext( nPrefix,
rLocalName,
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - configure.in vcl/Library_vcl.mk vcl/unx
configure.in |2 ++
vcl/Library_vcl.mk|5 +
vcl/unx/generic/printer/ppdparser.cxx |2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 00bc30789be6888903645cbbbf47974cd7109cad
Author: Riccardo Magliocchetti
Date: Thu Sep 6 09:05:27 2012 +0200
vcl: Add missing graphite support to headless build
Change-Id: I63966bac34678869dbd3ea177905896bbe8934f6
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5a1dc36..0a7c807 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -310,6 +310,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/generic/glyphs/graphite_serverfont \
))
endif
+ifeq ($(GUIBASE),headless)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+vcl/generic/glyphs/graphite_serverfont \
+))
+endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_libraries,vcl,\
version \
commit 56c307824feb9175c0281a376f836955d810864b
Author: Riccardo Magliocchetti
Date: Wed Sep 5 20:43:40 2012 +0200
configure: disable gnome-vfs with --enable-headless
We are not interested in desktop stuff but thanks!
Change-Id: I03d28ab0d3d2da5cafaebfce52c807bf0c956108
diff --git a/configure.in b/configure.in
index d2502c0..1c5e630 100644
--- a/configure.in
+++ b/configure.in
@@ -4064,6 +4064,7 @@ if test "$enable_headless" = "yes"; then
test_unix_quickstarter=no
test_cairo=no
enable_librsvg=no
+enable_gnome_vfs=no
fi
dnl check for cups support
commit 9d207b1158a88cb9b88b935392b61dce515a573d
Author: Riccardo Magliocchetti
Date: Wed Sep 5 20:35:24 2012 +0200
configure: disable librsvg with --enable-headless
librsvg have a long list of dependencies that requires at least
gdk, so X. On debian the headers package depends on cairo too.
Indeed not what we want.
Since comments here says that impress depends on it will need to
eventually disable build of impress.
Change-Id: Ic88f90d03d0a80c1ada9f4224faed9deab2bed52
diff --git a/configure.in b/configure.in
index 7780ab5..d2502c0 100644
--- a/configure.in
+++ b/configure.in
@@ -4063,6 +4063,7 @@ if test "$enable_headless" = "yes"; then
test_kde4=no
test_unix_quickstarter=no
test_cairo=no
+enable_librsvg=no
fi
dnl check for cups support
commit 22f2e5f286d55cd5c1ead07fb82cd78027abf490
Author: Riccardo Magliocchetti
Date: Wed Sep 5 20:20:01 2012 +0200
vcl: Fix cups ifdefery
So ENABLE_CUPS is defined if we want CUPS but that does not
guarantee that we actually have it installed. So use HAVE_CUPS_H
that is defined only if the cups headers are found.
Change-Id: I7c6c3659b368dbf9f8efab31ef457f41ac162160
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 42b05fc..baec393 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
PrinterInfoManager& rMgr = PrinterInfoManager::get();
if( rMgr.getType() == PrinterInfoManager::CUPS )
{
-#ifdef ENABLE_CUPS
+#ifdef HAVE_CUPS_H
pNewParser =
const_cast(static_cast(rMgr).createCUPSParser( aFile
));
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/textbodyproperties.hxx |2 +
oox/inc/oox/drawingml/transform2dcontext.hxx |3 +-
oox/source/drawingml/textbodyproperties.cxx | 15 ++-
oox/source/drawingml/transform2dcontext.cxx | 35 ---
oox/source/ppt/pptshapecontext.cxx |4 +--
5 files changed, 52 insertions(+), 7 deletions(-)
New commits:
commit 5ca197ce7a2a845933e17fc90195c929cbc7e062
Author: Muthu Subramanian
Date: Thu Sep 6 12:34:14 2012 +0530
n#771549: Import text offsets in shapes.
* Also fixed a bug where the (offset) increment was conditional.
* Reusing Transform2D for as well.
* This is a kind of hack where the margins are adjusted
for the give offset values.
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx
b/oox/inc/oox/drawingml/textbodyproperties.hxx
index 25007be..f8800be 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -36,6 +36,8 @@ struct TextBodyProperties
OptValue< sal_Int32 > moRotation;
OptValue< sal_Int32 > moVert;
boost::optional< sal_Int32 >moInsets[4];
+boost::optional< sal_Int32 >moTextOffX;
+boost::optional< sal_Int32 >moTextOffY;
::com::sun::star::drawing::TextVerticalAdjust meVA;
explicitTextBodyProperties();
diff --git a/oox/inc/oox/drawingml/transform2dcontext.hxx
b/oox/inc/oox/drawingml/transform2dcontext.hxx
index 8a8b18c..6bbbe19 100644
--- a/oox/inc/oox/drawingml/transform2dcontext.hxx
+++ b/oox/inc/oox/drawingml/transform2dcontext.hxx
@@ -34,11 +34,12 @@ class Transform2DContext : public
::oox::core::ContextHandler
{
public:
Transform2DContext( ::oox::core::ContextHandler& rParent,
-const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape )
throw();
+const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape,
bool btxXfrm = false ) throw();
virtual ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element, const
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
protected:
Shape& mrShape;
+boolmbtxXfrm;
};
//
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index f377ee9..36f39d9 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -75,8 +75,21 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32
nRotation )
for( sal_Int32 i = 0; i < n; i++ )
{
+sal_Int32 nVal = 0;
+
+// Hack for n#760986
+// TODO: Preferred method would be to have a textbox on top
+// of the shape and the place it according to the (off,ext)
+if( nOff == 0 && moTextOffX ) nVal = *moTextOffX;
+if( nOff == 1 && moTextOffY ) nVal = *moTextOffY;
+if( nVal < 0 ) nVal = 0;
+
if( moInsets[i] )
-maPropertyMap[ aProps[ ( nOff++ ) % n ] ] <<= static_cast<
sal_Int32 >( *moInsets[i] );
+maPropertyMap[ aProps[ nOff ] ] <<= static_cast< sal_Int32 >(
*moInsets[i] + nVal );
+else if( nVal )
+maPropertyMap[ aProps[ nOff ] ] <<= static_cast< sal_Int32 >( nVal
);
+
+nOff = (nOff+1) % n;
}
}
diff --git a/oox/source/drawingml/transform2dcontext.cxx
b/oox/source/drawingml/transform2dcontext.cxx
index 9ded1df..d35c5d3 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -20,6 +20,7 @@
#include "oox/drawingml/transform2dcontext.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/drawingml/shape.hxx"
+#include "oox/drawingml/textbody.hxx"
using ::com::sun::star::awt::Point;
using ::com::sun::star::awt::Size;
@@ -36,17 +37,45 @@ namespace drawingml {
//
/** context to import a CT_Transform2D */
-Transform2DContext::Transform2DContext( ContextHandler& rParent, const
Reference< XFastAttributeList >& xAttribs, Shape& rShape ) throw()
+Transform2DContext::Transform2DContext( ContextHandler& rParent, const
Reference< XFastAttributeList >& xAttribs, Shape& rShape, bool btxXfrm ) throw()
: ContextHandler( rParent )
, mrShape( rShape )
+, mbtxXfrm ( btxXfrm )
{
AttributeList aAttributeList( xAttribs );
-mrShape.setRotation( aAttributeList.getInteger( XML_rot, 0 ) ); //
6ths of a degree Positive angles are clockwise; negative angle
