[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/xml/xmlcondformat.cxx |2 ++ sc/source/filter/xml/xmldpimp.cxx | 15 --- 2 files changed, 10 insertions(+), 7 deletions(-) New commits: commit f4883ae27d834ed14547d5762780cd8596a930a4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 1 09:37:27 2013 +0100 Add breaks to default and don't overflow to defaut Change-Id: Id0c34041fc7f86bc737f69bfcaacee1c25fe818e diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index afe0890..208cfb5 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -311,13 +311,12 @@ const ScDPSaveDimension* getDimension( return rPageDims[nPos]; } -break; case ScDPOutputGeometry::Data: break; case ScDPOutputGeometry::None: break; default: -; +break; } return NULL; } @@ -335,8 +334,9 @@ ScDPOutputGeometry::FieldType toFieldType(sal_uInt16 nOrient) case sheet::DataPilotFieldOrientation_ROW: return ScDPOutputGeometry::Row; case sheet::DataPilotFieldOrientation_HIDDEN: +break; default: -; +break; } return ScDPOutputGeometry::None; } @@ -442,8 +442,9 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim) ++mnDataFieldCount; break; case sheet::DataPilotFieldOrientation_HIDDEN: +break; default: -; +break; } pDPSave-AddDimension(pDim); @@ -575,7 +576,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal( maColGrandTotal.maDisplayName = rDisplayName; break; default: -; +break; } } @@ -863,7 +864,7 @@ ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext( maDisplayName = rAttrValue; break; default: -; +break; } } } @@ -893,7 +894,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement() eOrient = XML_COLUMN; break; default: -; +break; } mpTableContext-SetGrandTotal(eOrient, mbVisible, maDisplayName); } commit a752069170acef13ea93f062bf61070313a69c14 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 1 09:32:02 2013 +0100 Don't overflow case to default so that adding of case will never overflow Change-Id: I3503a185b02a512d1f13f805b8d51fb48f34971e diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 424e041..5ca2cb7 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -573,6 +573,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport rImport, sal_uInt16 nPrfx, break; case XML_TOK_CONDITION_BASE_CELL_ADDRESS: sAddress = sValue; +break; default: break; } @@ -767,6 +768,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport rImport, sal_uInt16 nPrfx, break; case XML_TOK_COND_DATE_STYLE: sStyle = sValue; +break; default: break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Leftover dmake makefiles
On 03/01/2013 12:35 AM, Peter Foley wrote:
We still have 153 dmake files left over in test, qa, and workben directories.
Somebody should go through them and decide which of the various
examples, tests, etc. are worth keeping.
There's a few places, like desktop/test/deployment/{active,passive}/,
that I use every once in a while, but typically only adjust to any
changes that accumulated in the meantime whenever I actually want to use
it again.
Therefore, if it doesn't hurt too much, I'd prefer to not clean up too
aggressively there. (Sure, you can always resurrect removed stuff from
the repo, but, frankly, that can be a pain, esp. if you can't remember
/exactly/ what you are actually looking for and thus need to grep
around. Then again, other rotten places are so untouched for the last
decade that just removing them won't upset anybody.)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/IDocumentMarkAccess.hxx |8 -
sw/source/core/doc/docbm.cxx | 53 -
sw/source/core/inc/MarkManager.hxx |3 +-
3 files changed, 50 insertions(+), 14 deletions(-)
New commits:
commit 282b920c97384560b3d2f6a10b156fa5316b
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 28 13:14:45 2013 +0100
fdo#61016: sw::marks::MarkManager: delay deletion of text fieldmarks
There is a STL assertion in deleteMarks because the ReleaseDoc call will
recursively call into deleteMark again and delete marks that are in the
vector vMarksToDelete up the stack.
Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf
(cherry picked from commit 5bf6797e81d54177508d3eb370e8242e3b58a3f8)
Reviewed-on: https://gerrit.libreoffice.org/2466
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 9b4bbb1..21e2d0c 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -57,6 +57,11 @@ class IDocumentMarkAccess
typedef container_t::const_iterator const_iterator_t;
typedef container_t::const_reverse_iterator const_reverse_iterator_t;
+/// To avoid recursive calls of deleteMark, the removal of dummy
+/// characters of fieldmarks has to be delayed; this is the baseclass
+/// that can be subclassed for that purpose.
+struct ILazyDeleter { virtual ~ILazyDeleter() { } };
+
/** Generates a new mark in the document for a certain selection.
@param rPaM
@@ -168,7 +173,8 @@ class IDocumentMarkAccess
@param ppMark
[in] an iterator pointing to the Mark to be deleted.
*/
-virtual void deleteMark(const IDocumentMarkAccess::const_iterator_t
ppMark) =0;
+virtual ::boost::shared_ptrILazyDeleter
+deleteMark(const IDocumentMarkAccess::const_iterator_t ppMark) =0;
/** Deletes a mark.
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 76e9cfc..afd9fc2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -644,16 +644,24 @@ namespace sw { namespace mark
}
}
-// we just remembered the iterators to delete, so we do not need to
search
-// for the boost::shared_ptr (the entry in m_vMarks) again
-// reverse iteration, since erasing an entry invalidates iterators
-// behind it (the iterators in vMarksToDelete are sorted)
-for(vectorconst_iterator_t::reverse_iterator pppMark =
vMarksToDelete.rbegin();
-pppMark != vMarksToDelete.rend();
-++pppMark)
{
-deleteMark(*pppMark);
-}
+// fdo#61016 delay the deletion of the fieldmark characters
+// to prevent that from deleting the marks on that position
+// which would invalidate the iterators in vMarksToDelete
+vector ::boost::shared_ptrILazyDeleter vDelay;
+vDelay.reserve(vMarksToDelete.size());
+// we just remembered the iterators to delete, so we do not need to
+// search for the boost::shared_ptr (the entry in m_vMarks)
again.
+// reverse iteration, since erasing an entry invalidates iterators
+// behind it (the iterators in vMarksToDelete are sorted)
+for (vectorconst_iterator_t::reverse_iterator pppMark
+= vMarksToDelete.rbegin();
+pppMark != vMarksToDelete.rend();
+++pppMark)
+{
+vDelay.push_back(deleteMark(*pppMark));
+}
+} // scope to kill vDelay
if(isSortingNeeded)
sortMarks();
#if 0
@@ -662,9 +670,26 @@ namespace sw { namespace mark
#endif
}
-void MarkManager::deleteMark(const const_iterator_t ppMark)
+struct LazyTextFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
+{
+::boost::shared_ptrIMark const m_pTextFieldmark;
+SwDoc *const m_pDoc;
+LazyTextFieldmarkDeleter(
+::boost::shared_ptrIMark const pMark, SwDoc *const pDoc)
+: m_pTextFieldmark(pMark), m_pDoc(pDoc)
+{ }
+virtual ~LazyTextFieldmarkDeleter()
+{
+dynamic_castTextFieldmark*(m_pTextFieldmark.get())
+-ReleaseDoc(m_pDoc);
+}
+};
+
+::boost::shared_ptrIDocumentMarkAccess::ILazyDeleter
+MarkManager::deleteMark(const const_iterator_t ppMark)
{
-if(ppMark == m_vMarks.end()) return;
+::boost::shared_ptrILazyDeleter ret;
+if (ppMark == m_vMarks.end()) return ret;
switch(IDocumentMarkAccess::GetType(**ppMark))
{
@@ -690,7 +715,10 @@ namespace sw { namespace mark
m_vFieldmarks.erase(ppFieldmark);
[Libreoffice-commits] libcdr.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c9a34b15ba348da33e5107514ec4e3eb34fea24 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 1 09:46:20 2013 +0100 Bump version for a point release diff --git a/configure.ac b/configure.ac index 0c98560..de4bbbf 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libcdr_version_major],[0]) m4_define([libcdr_version_minor],[0]) -m4_define([libcdr_version_micro],[10]) +m4_define([libcdr_version_micro],[11]) m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/crsr/bookmrk.cxx |7 +++
sw/source/core/doc/docbm.cxx| 20 +++-
sw/source/core/inc/bookmrk.hxx |5 -
3 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit d10c1b3a54f0264f895c2e5b0056e955f7d07380
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 28 13:27:57 2013 +0100
sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is deleted
Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc
(cherry picked from commit 75b2f6b241046d4467a7c0c9cbf49b4533b46045)
Reviewed-on: https://gerrit.libreoffice.org/2467
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 7e84482..a3c5217 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -355,6 +355,13 @@ namespace sw { namespace mark
// want this for checkboxes
this-GetMarkEnd( ).nContent--;
}
+
+void CheckboxFieldmark::ReleaseDoc(SwDoc* const pDoc)
+{
+lcl_RemoveFieldMarks(this, pDoc,
+CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FORMELEMENT);
+}
+
void CheckboxFieldmark::SetChecked(bool checked)
{
if ( IsChecked() != checked )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index afd9fc2..8f785dd 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -670,18 +670,17 @@ namespace sw { namespace mark
#endif
}
-struct LazyTextFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
+struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
{
-::boost::shared_ptrIMark const m_pTextFieldmark;
+::boost::shared_ptrIMark const m_pFieldmark;
SwDoc *const m_pDoc;
-LazyTextFieldmarkDeleter(
+LazyFieldmarkDeleter(
::boost::shared_ptrIMark const pMark, SwDoc *const pDoc)
-: m_pTextFieldmark(pMark), m_pDoc(pDoc)
+: m_pFieldmark(pMark), m_pDoc(pDoc)
{ }
-virtual ~LazyTextFieldmarkDeleter()
+virtual ~LazyFieldmarkDeleter()
{
-dynamic_castTextFieldmark*(m_pTextFieldmark.get())
--ReleaseDoc(m_pDoc);
+dynamic_castFieldmark *(m_pFieldmark.get())-ReleaseDoc(m_pDoc);
}
};
@@ -713,12 +712,7 @@ namespace sw { namespace mark
MarkManager::deleteMark(..)
- Bookmark not found.);
m_vFieldmarks.erase(ppFieldmark);
-sw::mark::TextFieldmark* pTextFieldmark =
dynamic_castsw::mark::TextFieldmark*(ppMark-get());
-if (pTextFieldmark)
-{
-ret.reset(
-new LazyTextFieldmarkDeleter(*ppMark, m_pDoc));
-}
+ret.reset(new LazyFieldmarkDeleter(*ppMark, m_pDoc));
break;
}
case IDocumentMarkAccess::NAVIGATOR_REMINDER:
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 6937a19..d4959b2 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -213,6 +213,8 @@ namespace sw {
virtual void SetFieldHelptext(const ::rtl::OUString
aFieldHelptext)
{ m_aFieldHelptext = aFieldHelptext; }
+virtual void ReleaseDoc(SwDoc* const) = 0;
+
virtual void Invalidate();
virtual rtl::OUString ToString() const;
@@ -228,7 +230,7 @@ namespace sw {
public:
TextFieldmark(const SwPaM rPaM);
virtual void InitDoc(SwDoc* const io_pDoc);
-void ReleaseDoc(SwDoc* const pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
};
class CheckboxFieldmark
@@ -238,6 +240,7 @@ namespace sw {
public:
CheckboxFieldmark(const SwPaM rPaM);
virtual void InitDoc(SwDoc* const io_pDoc);
+virtual void ReleaseDoc(SwDoc* const pDoc);
bool IsChecked() const;
void SetChecked(bool checked);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#61016: sw::marks::MarkManager: delay deletion of text fi...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2466 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2466 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2467 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2467 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building MySQL-Connector on Ubuntu 12.04 32 bit
On 03/01/2013 02:52 AM, Dan Lewis wrote: Hi Dan, 5) I installed this MySQL Connector 1.0.2 on 4.0.1.1, but I can not connect to either server. As you found out for yourself, the connector doesn't appear to work outside of the build for which it is compiled. See also the thread on this dev list entitled : C++ extensions requiring LIBO_UDK_4.1 Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - android/Bootstrap android/CustomTarget_android_desktop.mk android/CustomTarget_docloader.mk android/CustomTarget_lo4android.mk android/CustomTarget_sdremote
android/Bootstrap/Makefile.shared |6 +-- android/CustomTarget_android_desktop.mk | 34 android/CustomTarget_docloader.mk | 19 +++ android/CustomTarget_lo4android.mk| 21 +++- android/CustomTarget_sdremote.mk |8 +++- android/Module_android.mk |1 android/experimental/DocumentLoader/Makefile |2 - android/experimental/LibreOffice4Android/Makefile |2 - android/experimental/desktop/Makefile |2 - android/sdremote/Makefile |6 +-- ios/CustomTarget_Viewer_app.mk|3 + odk/examples/java/DocumentHandling/test/test1.odt |binary sal/osl/all/log.cxx | 37 -- 13 files changed, 111 insertions(+), 30 deletions(-) New commits: commit 18e035964e92cb4348a4de0bafc4114608ed4754 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 1 10:55:34 2013 +0200 Cleanups to the android and ios makefilery Also build the desktop app from gbuild. Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 9eb1800..de025c0 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -23,7 +23,7 @@ define COPYSO endef define COPYJAR -cp $(1) libs +mkdir -p libs cp $(1) libs endef # @@ -58,7 +58,7 @@ properties: echo APP_PLATFORM := android-14 jni/Application.mk install: build-ant - unset JAVA_HOME $(ANT) debug install + unset JAVA_HOME $(ANT) -quiet debug install @echo @echo 'Run it with make run' @echo @@ -67,7 +67,7 @@ uninstall: $(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE) clean: android_version_setup properties - $(ANT) clean + $(ANT) -quiet -keep-going clean rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml # diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk new file mode 100644 index 000..bc62a33 --- /dev/null +++ b/android/CustomTarget_android_desktop.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$(eval $(call gb_CustomTarget_CustomTarget,android/desktop)) + +android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Desktop) + +$(call gb_CustomTarget_get_target,android/desktop) : \ + $(android_desktop_DIR)/done + +# We know that CustomTarget_lo4android.mk is included before this file +# in Module_android.mk, so lo4android_DIR is defined. We want that to +# be built completely first, so that we can serialize Ant access to +# Bootstrap and abs-lib, which are used by Desktop (this makefile), +# LibreOffice4Android, DocumentLoader and sdremote. We don't want one +# Ant to be cleaning out one place while another is building stuff +# that depends on it. Yeah, this sucks + +$(android_desktop_DIR)/done : $(lo4android_DIR)/done + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) + cd $(SRCDIR)/android/experimental/desktop $(MAKE) all + mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin + cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin + +$(call gb_CustomTarget_get_clean_target,android/desktop) : + $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) + cd $(SRCDIR)/android/experimental/desktop $(MAKE) clean + +# vim: set noet sw=4 ts=4: diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index e0d5fbb..c30699e 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -13,16 +13,21 @@ docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Documen $(call gb_CustomTarget_get_target,android/docloader) : \ $(docloader_DIR)/done -# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is -# defined. We want that to be built completely first, so that we can -# serialize Ant access to Bootstrap, which is used both by DocumentLoader and -# sdremote. We don't want one Ant to be cleaning out Bootstrap while another -# is building stuff that depends on it. Yeah, this sucks +# We know that CustomTarget_sdremote.mk is included first, so +# sdremote_DIR is defined. We want that to be built completely first, +# so that we can serialize Ant access to Bootstrap, which is used both +# by DocumentLoader and sdremote. We don't want one Ant to be cleaning +# out Bootstrap while another is building
[Libreoffice-commits] core.git: 2 commits - mysqlc/Library_mysqlc.mk mysqlc/README
mysqlc/Library_mysqlc.mk |4 - mysqlc/README| 106 +-- 2 files changed, 50 insertions(+), 60 deletions(-) New commits: commit a42649c6743a54498375903b4357c4c0545fbab8 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Mar 1 09:55:05 2013 +0100 fdo#60907 Use *one* variable for the MySQL library file as opposed to two with different values, which leads to trouble Change-Id: Ic603105187b6078bd46d6c253410af28e188c70f diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index d97328a..cf77bc0 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -35,15 +35,13 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\ cppuhelper \ )) -MYSQL_LIBFILE :=$(if $(filter WNT,$(OS)),libmysql.dll,$(if $(filter MACOSX,$(OS)),libmysql.16.dylib,libmysql.so.16)) - $(eval $(call gb_Library_add_defs,mysqlc,\ -DCPPDBC_EXPORTS \ -DCPPCON_LIB_BUILD \ -DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \ -DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \ -DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \ - $(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\$(MYSQL_LIBFILE)\) \ + $(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\$(LIBMYSQL)\) \ $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ -DCPPCONN_LIB=\$(call gb_Library_get_runtime_filename,mysqlcppconn)\) \ )) commit c7ef87aa8db6d892491891dcda6bfbaa1ad1d0d2 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Mar 1 09:44:45 2013 +0100 mysqlc/README was *very* out of date Change-Id: I3a50ec19d42aa08d1346c9d0bdc1045f4ce88cd0 diff --git a/mysqlc/README b/mysqlc/README index 17345da..abc5b98 100644 --- a/mysqlc/README +++ b/mysqlc/README @@ -1,68 +1,60 @@ The MySQL driver for LibreOffice. -== Status == - -The code is on a PREVIEW level. PREVIEW means pre-alpha. - +It ships as an extension (.oxt file). == Requirements == -The MySQL driver for OpenOffice.org (MySQL Connector/OpenOffice.org - C/OOo) +The MySQL driver for LibreOffice (MySQL Connector/LibreOffice - C/LibO) requires two external libraries to be build: 1) The MySQL Client Library (libmysql) - 2) The MySQL Connector/C++ Library (libmysqlcppcon) - -At the time of writing neither of the two libraries are part of the CWS! -Before you can build the MySQL driver for OpenOffice.org you must install -the two required libraries on your system before you can compile the driver. - -You need the two libraries because the MySQL driver for OpenOffice.org -does not feature an implementation of the MySQL Client Server -communication protocol. The protocol implementation is part of the MySQL -Client Library. And the SDBC(X) style OpenOffice.org driver is implemented as a -wrapper of the MySQL Connector/C++ Library which implements a JDBC interface and -in turn uses the C based MySQL Client Library. - -1) MySQL Client Library (libmysql) - -The MySQL Client Library (libmysql) is part of the MySQL Server. You need to -download and install the MySQL Server. Use a binary distribution of -MySQL 5.0.x or MySQL 5.1.x. Check the MySQL manual for instructions, e.g. -for Unix: - - http://dev.mysql.com/doc/refman/5.1/en/installing-binary.html - + 2) The MySQL Connector/C++ Library (libmysqlcppconn) + +libmysql is not included as an external and needs to be provided by +the build environment, but libmysqlcppconn is provided as an external +and will be automatically compiled if you pass +--without-system-mysql-cppconn to autogen.sh. + +The MySQL driver for LibreOffice does not reimplement the MySQL +Client/Server communication protocol. The protocol implementation is +part of the MySQL Client Library. The SDBC(X) driver is implemented as +a wrapper of the MySQL Connector/C++ Library which implements a +JDBC-like interface (which suits SDBC(X) well) and which in turn uses +the C based MySQL Client Library. + +== Variants == + +If configured with --with-system-mysql, the driver will *not* ship a +copy of the MySQL client C library and will expect it to be installed +in a standard location on each system that it runs on. That is usually +the right choice to create a native package/port for GNU/Linux, BSD, +etc, where the packaging system handles dependencies and will ensure +the availability of the MySQL client C library in the standard +location. + +If configured with --with-libmysql-path, the driver will ship a copy +of the MySQL client C library so that it works out of the box on any +system. That is usually the right choice to create a stand-alone .oxt +file that users can just install through the LibreOffice extensions +manager, as is typical for Microsoft Windows and Apple MacOS X native +(as opposed to MacPorts/fink/pkgsrc/...). + +== Installing the Requirements == + +On modern/free-as-in-free-speech Unices, libmysql and libmysqlcppconn +are probably available as a package/port. Install them using your +distribution's tools. Make sure to install the development
Re: Leftover dmake makefiles
On 2013-03-01 10:39, Stephan Bergmann wrote:
On 03/01/2013 12:35 AM, Peter Foley wrote:
We still have 153 dmake files left over in test, qa, and workben
directories.
Somebody should go through them and decide which of the various
examples, tests, etc. are worth keeping.
There's a few places, like desktop/test/deployment/{active,passive}/,
that I use every once in a while, but typically only adjust to any
changes that accumulated in the meantime whenever I actually want to
use it again.
Therefore, if it doesn't hurt too much, I'd prefer to not clean up too
aggressively there. (Sure, you can always resurrect removed stuff
from the repo, but, frankly, that can be a pain, esp. if you can't
remember /exactly/ what you are actually looking for and thus need to
grep around. Then again, other rotten places are so untouched for the
last decade that just removing them won't upset anybody.)
Maybe we can just cleanup any dmake files that haven't been touched for
X years, where X is whatever number you are comfortable with?
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac solenv/inc
configure.ac | 13 - solenv/inc/.gitignore |3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) New commits: commit 8cbd48f732587653870dc5996aef8af2db1fb51b Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 1 10:05:55 2013 +0100 avoid relinking on windows after every configure run Since 2ba9023a60f41f5ba414fa0f7682ac8104b3a00b WinResTarget depends on solenv_inc, which eventually depends on solenv/inc/minor.mk , which means relinking all libraries on Windows after each configure run. As AC_CONFIG_FILES updates generated files unconditionally, use a temporary and update only when it's actually changed. Change-Id: Ie5503ed7cdf307ab51935d271e9f1603b5e8f987 diff --git a/configure.ac b/configure.ac index e6f78a7..de10a0e 100644 --- a/configure.ac +++ b/configure.ac @@ -11827,7 +11827,18 @@ if test -f config_host.mk; then config_md5=`$MD5SUM config_host.mk | sed s/ .*//` fi -AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst]) +AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst]) +# Unlike AC_CONFIG_HEADERS, AC_CONFIG_FILES updates the target file even if the contents +# would be unchanged, avoid that. +AC_CONFIG_FILES([solenv/inc/minor.mk.tmp:solenv/inc/minor.mk.in], +[ +AC_MSG_NOTICE([creating solenv/inc/minor.mk]) +if diff solenv/inc/minor.mk.tmp solenv/inc/minor.mk /dev/null 21 ; then +AC_MSG_NOTICE([solenv/inc/minor.mk is unchanged]) +else +cp -f solenv/inc/minor.mk.tmp solenv/inc/minor.mk +fi +]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) diff --git a/solenv/inc/.gitignore b/solenv/inc/.gitignore index b8fab61..ef9372e 100644 --- a/solenv/inc/.gitignore +++ b/solenv/inc/.gitignore @@ -1 +1,2 @@ -/minor.mk \ No newline at end of file +/minor.mk +/minor.mk.tmp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] autosave feature progress
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2480
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/2480/1
autosave feature progress
Change-Id: I58e4d2e9d017ad6d6d0fda21c68447373dab12d4
---
M cui/source/options/optsave.cxx
M cui/source/options/optsave.hrc
M cui/source/options/optsave.hxx
M cui/source/options/optsave.src
M framework/inc/services/autorecovery.hxx
M framework/source/services/autorecovery.cxx
M sfx2/inc/sfx2/sfxsids.hrc
M sfx2/source/appl/appcfg.cxx
M unotools/inc/unotools/saveopt.hxx
M unotools/source/config/saveopt.cxx
10 files changed, 150 insertions(+), 20 deletions(-)
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index d977cac..2ada021 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -55,8 +55,9 @@
#define CFG_PAGE_AND_GROUP OUString(General), OUString(LoadSave)
// !! you have to update these index, if you changed the list of the child
windows !!
-#define WININDEX_AUTOSAVE ((sal_uInt16)6)
-#define WININDEX_SAVEURL_RELFSYS((sal_uInt16)9)
+#define WININDEX_AUTOSAVE ((sal_uInt16) 6)
+#define WININDEX_USERAUTOSAVE ((sal_uInt16) 9)
+#define WININDEX_SAVEURL_RELFSYS((sal_uInt16)10)
// --
@@ -102,6 +103,7 @@
aMinuteFT ( this, CUI_RES( FT_MINUTE ) ),
aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ),
+aUserAutoSaveCB ( this, CUI_RES( BTN_USERAUTOSAVE ) ),
aDefaultFormatFL( this, CUI_RES( FL_FILTER ) ),
aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ),
@@ -239,11 +241,22 @@
aAutoSaveEdit.Hide();
aMinuteFT.Hide();
// the other controls have to move upwards the height of checkbox +
space
-nDelta += aRelativeFsysCB.GetPosPixel().Y() -
aAutoSaveCB.GetPosPixel().Y();
+nDelta += aUserAutoSaveCB.GetPosPixel().Y() -
aAutoSaveCB.GetPosPixel().Y();
}
else if ( nDelta 0 )
// the AutoSave controls have to move upwards too
nWinIndex = WININDEX_AUTOSAVE;
+
+if ( aOptionsDlgOpt.IsOptionHidden( UserAutoSave, CFG_PAGE_AND_GROUP ) )
+{
+// hide controls of UserAutoSave
+aUserAutoSaveCB.Hide();
+// the other controls have to move upwards the height of checkbox +
space
+nDelta += aRelativeFsysCB.GetPosPixel().Y() -
aUserAutoSaveCB.GetPosPixel().Y();
+}
+else if ( nDelta 0 )
+// the UserAutoSave controls have to move upwards too
+nWinIndex = WININDEX_USERAUTOSAVE;
if ( nDelta 0 )
{
@@ -313,6 +326,13 @@
{
rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit.GetValue() ) );
+bModified |= sal_True;
+}
+
+if ( aUserAutoSaveCB.IsChecked() != aUserAutoSaveCB.GetSavedValue() )
+{
+rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
+ aUserAutoSaveCB.IsChecked() ) );
bModified |= sal_True;
}
// save relatively
@@ -489,6 +509,7 @@
aBackupFI.Show(bBackupRO);
aAutoSaveCB.Check(aSaveOpt.IsAutoSave());
+aUserAutoSaveCB.Check(aSaveOpt.IsUserAutoSave());
aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat());
aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
@@ -515,6 +536,8 @@
aAutoSaveCB.SaveValue();
aAutoSaveEdit.SaveValue();
+aUserAutoSaveCB.SaveValue();
+
aRelativeFsysCB.SaveValue();
aRelativeInetCB.SaveValue();
aODFVersionLB.SaveValue();
@@ -530,11 +553,13 @@
{
aAutoSaveEdit.Enable();
aMinuteFT.Enable();
+aUserAutoSaveCB.Enable();
}
else
{
aAutoSaveEdit.Disable();
aMinuteFT.Disable();
+aUserAutoSaveCB.Disable();
}
}
return 0;
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index 16891bc..36a95b6 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -29,6 +29,7 @@
#define BTN_AUTOSAVE16
#define ED_AUTOSAVE 17
#define FT_MINUTE 18
+#define BTN_USERAUTOSAVE19
#define BTN_NOPRETTYPRINTING20
#define FI_BACKUP 21
#define BTN_WARNALIENFORMAT 22
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 4ab3082..00cb63f 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -54,6 +54,7 @@
CheckBoxaAutoSaveCB;
NumericFieldaAutoSaveEdit;
FixedText aMinuteFT;
+CheckBoxaUserAutoSaveCB;
CheckBoxaRelativeFsysCB;
CheckBox
[PATCH] not working, throws exception in config menu when trying to ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2481
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/2481/1
not working, throws exception in config menu when trying to write config key
Change-Id: I2da740eeba796d630c58d209a3d685650096a206
---
M cui/source/options/optsave.src
M framework/source/services/autorecovery.cxx
M officecfg/registry/data/org/openoffice/Office/Recovery.xcu
M officecfg/registry/schema/org/openoffice/Office/Common.xcs
M shell/source/backends/gconfbe/gconfaccess.cxx
M shell/source/backends/gconfbe/gconfaccess.hxx
M unotools/source/config/saveopt.cxx
7 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index d92df79..32bcb6e 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -115,7 +115,7 @@
HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_USERAUTOSAVE; //? FIX ME
Pos = MAP_APPFONT ( 12 , 74 ) ;
Size = MAP_APPFONT ( 163 , 10 ) ;
-Text [ en-US ] = Save document when saving ~AutoRecovery information
;
+Text [ en-US ] = Save document when saving AutoRecovery information ;
};
CheckBox BTN_RELATIVE_FSYS
{
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index c9c14f9..c065d35 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -21,6 +21,8 @@
#include services/autorecovery.hxx
#include loadenv/loadenv.hxx
+#include sfx2/sfxbasemodel.hxx //?
+
#include loadenv/targethelper.hxx
#include pattern/frame.hxx
#include threadhelp/readguard.hxx
@@ -124,7 +126,7 @@
static const char CFG_ENTRY_AUTOSAVE_ENABLED[] = AutoSave/Enabled;
static const char CFG_ENTRY_AUTOSAVE_TIMEINTERVALL[] =
AutoSave/TimeIntervall; //sic!
-static const char CFG_ENTRY_USERAUTOSAVE_ENABLED[] = UserAutoSave/Enabled;
+static const char CFG_ENTRY_USERAUTOSAVE_ENABLED[] =
AutoSave/UserAutoSaveEnabled;
static const char CFG_PATH_AUTOSAVE[] = AutoSave;
static const char CFG_ENTRY_MINSPACE_DOCSAVE[] = MinSpaceDocSave;
@@ -2357,10 +2359,11 @@
{
xDocRecover-storeToRecoveryFile( rInfo.NewTempURL,
lNewArgs.getAsConstPropertyValueList() );
-//if userautosave is enabled, also save to the original file
+// if userautosave is enabled, also save to the original file
if((m_eJob AutoRecovery::E_AUTO_SAVE) ==
AutoRecovery::E_AUTO_SAVE)
{
-//dispatchURL( rtl::OUString( .uno:Save ), rtl::OUString(),
xFrame, aArgs );
+//SfxBaseModel::storeToURL( rInfo.OrgURL,
lOldArgs.getAsConstPropertyValueList() );
+//xDocRecover-storeToRecoveryFile( rInfo.OrgURL,
lOldArgs.getAsConstPropertyValueList() );
}
#ifdef TRIGGER_FULL_DISC_CHECK
diff --git a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
index e5fbed4..92cbff7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
@@ -25,6 +25,10 @@
value oor:external=
com.sun.star.configuration.backend.GconfBackend AutoSaveEnabled/
/prop
+prop oor:name=UserAutoSaveEnabled
+ value oor:external=
+ com.sun.star.configuration.backend.GconfBackend
UserAutoSaveEnabled/
+/prop
prop oor:name=TimeIntervall
value oor:external=
com.sun.star.configuration.backend.GconfBackend
AutoSaveTimeIntervall/
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3e89fa1..f62fe36 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2545,6 +2545,18 @@
/info
valuefalse/value
/prop
+prop oor:name=UserAutoSaveEnabled oor:type=xs:boolean
oor:nillable=false
+ !-- OldPath: General/Save/Documents --
+ !-- OldLocation: soffice.cfg --
+ !-- UIHints: Tools Options - General Save - [Section] Save --
+ info
+author_/author
+descSpecifies whether to save over the original document when
+auto saving./desc
+labelSave file when AutoSaving/label
+ /info
+ valuefalse/value
+/prop
prop
oor:name=CreateBackup oor:type=xs:boolean oor:nillable=false
!-- OldPath: General/Save/Documents --
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 4705013..71276da 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -34,6 +34,7 @@
#define GCONF_PROXY_MODE_KEY /system/proxy/mode
[PATCH] fdo#61602 use the new Turkish Lira sign
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2482 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2482/1 fdo#61602 use the new Turkish Lira sign Change-Id: Ic07d9147ad559573e4e6a3818ee78b8dfcedf12f --- M i18npool/source/localedata/data/tr_TR.xml 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index 8cf411b..b13ce5d 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -88,22 +88,22 @@ FormatCode0,00%/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY formatindex=12 - FormatCode#.##0[$TL-41F];-#.##0[$TL-41F]/FormatCode + FormatCode#.##0[$₺-41F];-#.##0[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey2 default=false type=medium usage=CURRENCY formatindex=13 - FormatCode#.##0,00[$TL-41F];-#.##0,00[$TL-41F]/FormatCode + FormatCode#.##0,00[$₺-41F];-#.##0,00[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey3 default=false type=medium usage=CURRENCY formatindex=14 - FormatCode#.##0[$TL-41F];[RED]-#.##0[$TL-41F]/FormatCode + FormatCode#.##0[$₺-41F];[RED]-#.##0[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey4 default=true type=medium usage=CURRENCY formatindex=15 - FormatCode#.##0,00[$TL-41F];[RED]-#.##0,00[$TL-41F]/FormatCode + FormatCode#.##0,00[$₺-41F];[RED]-#.##0,00[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey5 default=false type=medium usage=CURRENCY formatindex=16 FormatCode#.##0,00 CCC/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey6 default=false type=medium usage=CURRENCY formatindex=17 - FormatCode#.##0,--[$TL-41F];[RED]-#.##0,--[$TL-41F]/FormatCode + FormatCode#.##0,--[$₺-41F];[RED]-#.##0,--[$₺-41F]/FormatCode /FormatElement FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 FormatCodeDD.MM.YY/FormatCode @@ -341,7 +341,7 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDTRY/CurrencyID - CurrencySymbolTL/CurrencySymbol + CurrencySymbol₺/CurrencySymbol BankSymbolTRY/BankSymbol CurrencyNameTürk Lirası/CurrencyName DecimalPlaces2/DecimalPlaces -- To view, visit https://gerrit.libreoffice.org/2482 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic07d9147ad559573e4e6a3818ee78b8dfcedf12f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: liborcus/ExternalProject_liborcus.mk
liborcus/ExternalProject_liborcus.mk | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) New commits: commit fa387a548e105b0dac2fb891824bc29e9f2ce149 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 1 11:15:56 2013 +0200 Add informative comment and revert unneeded (?) change Surely if we need to use -D_GLIBCXX_HAS_GTHREADS on Android we should do that somehow globally then and not just here in liborcus? But I haven't seen any compilation errors caused by a lack of that? (Except, if memory serves me right, for the Android on MIPS platform, but I haven't tried building that for ages.) And anyway, setting CPPFLAGS to one value in the environment for configure and passing a CPPFLAGS setting on the configure command line (in the --enable-dbgutil case) surely is pointless. This reverts 84374b2d4c44a5c81277ebc18eadd632cd8497b5 Change-Id: I2a280bb24dc0a557c825070866e1969c3176fc3f diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index af72a61..7b12302 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -47,10 +47,17 @@ endif else -# must be built with debug STL if --enable-dbgutil +# Must be built with debug GNU C++ library if --enable-dbgutil has +# caused the LO code to be built thusly. + +# The LIBS setting for Android is needed to get the orcus-xml-dump +# executable to build successfully. We obviously don't actually need +# that executable on Android, but we don't want to bother with +# patching out building it for Android. + $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm' CPPFLAGS=-D_GLIBCXX_HAS_GTHREADS) \ + $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ ./configure \ --with-pic \ --enable-static \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: undefined reference error while build
Hi, I understand the valid notions and concerns raised by you, but I as I was trying to say in my last mail, that I were already doing these (suggested) changes, but they were not reflected in my git diff file. Reason being, I was 'unaware' of the fact that I am 'not' supposed to do any changes in the solver folder, *while I did some there*, and those were the changes one was unable to see in my git diff file. Knowing which I corrected myself and got appropriate results. Nevertheless, I am always happy to know and learn from my mistakes and have been finally able to remove this error successfully :) The most recent issue I am having is that, I 'make', the cpu reaches this state and then does nothing (I left cpu for around 7 hours): [build CHK] tail_build [build ALL] top level modules: tail_build [build ALL] loaded modules: MathMLDTD Mesa UnoControls accessibility afms animations apache_commons apple_remote autodoc avmedia basctl basebmp basegfx basic bean beanshell binaryurp bluez_bluetooth boost bridges cairo canvas chart2 cli_ure clucene codemaker comphelper configmgr connectivity cosv cppcanvas cppu cppuhelper cppunit cpputools cui curl dbaccess desktop drawinglayer dtrans editeng embeddedobj embedserv eventattacher expat extensions external extras fileaccess filter forms formula fpicker framework graphite helpcompiler hsqldb hunspell hwpfilter hyphen i18npool i18nutil icu idl idlc io javaunohelper jfreereport jurt jvmaccess jvmfwk l10ntools lcms2 libcdr libcmis libexttextcat liblangtag libmspub liborcus librelogo libvisio libwpd libwpg libwps libxmlsec lingucomponent linguistic lotuswordpro lpsolve mdds more_fonts mythes neon np_sdk nss o3tl offapi officecfg oovbaapi oox openldap openssl package padmin postgresql postprocess psprint_config python3 pyuno readlicense_oo redland registry remotebridges reportbuilder reportdesign rhino ridljar rsc sal salhelper sane sax sc scaddins sccomp scp2 scripting sd sdext setup_native sfx2 shell slideshow smoketest solenv soltools sot starmath stoc store svgio svl svtools svx sw swext sysui tail_build test testtools tomcat toolkit tools touch tubes twain ucb ucbhelper ucpp udkapi udm unixODBC unodevtools unoidl unoil unotest unotools unoxml ure uui vbahelper vcl vigra wizards writerfilter writerperfect xmerge xmlhelp xmloff xmlreader xmlscript xmlsecurity xpdf [build CHK] loaded modules: MathMLDTD Mesa UnoControls accessibility afms animations apache_commons apple_remote autodoc avmedia basctl basebmp basegfx basic bean beanshell binaryurp bluez_bluetooth boost bridges cairo canvas chart2 cli_ure clucene codemaker comphelper configmgr connectivity cosv cppcanvas cppu cppuhelper cppunit cpputools cui curl dbaccess desktop drawinglayer dtrans editeng embeddedobj embedserv eventattacher expat extensions external extras fileaccess filter forms formula fpicker framework graphite helpcompiler hsqldb hunspell hwpfilter hyphen i18npool i18nutil icu idl idlc io javaunohelper jfreereport jurt jvmaccess jvmfwk l10ntools lcms2 libcdr libcmis libexttextcat liblangtag libmspub liborcus librelogo libvisio libwpd libwpg libwps libxmlsec lingucomponent linguistic lotuswordpro lpsolve mdds more_fonts mythes neon np_sdk nss o3tl offapi officecfg oovbaapi oox openldap openssl package padmin postgresql postprocess psprint_config python3 pyuno readlicense_oo redland registry remotebridges reportbuilder reportdesign rhino ridljar rsc sal salhelper sane sax sc scaddins sccomp scp2 scripting sd sdext setup_native sfx2 shell slideshow smoketest solenv soltools sot starmath stoc store svgio svl svtools svx sw swext sysui tail_build test testtools tomcat toolkit tools touch tubes twain ucb ucbhelper ucpp udkapi udm unixODBC unodevtools unoidl unoil unotest unotools unoxml ure uui vbahelper vcl vigra wizards writerfilter writerperfect xmerge xmlhelp xmloff xmlreader xmlscript xmlsecurity xpdf Any help regarding this shall be highly appreciable. Thanking you in anticipation Regards Prashant On Thu, Feb 28, 2013 at 4:37 PM, Caolán McNamara caol...@redhat.com wrote: On Thu, 2013-02-28 at 01:06 +0530, Prashant Pandey wrote: Hello everyone, I am having a hard time debugging the undefined reference to some_function error. I made following changes: http://pastebin.com/DqqTsP7A. Errors are: http://pastebin.com/PW0yzzgA. Try and send your patches, even ones that are works in progress, as attachments, rather than pastebin Anyway... I can't see how you got as far as the linker failure, you should have gotten a compiler error of no matching function for call to String::GetToken(... sal_Int32) which is the problem. You've changed various stuff like.. - xub_StrLen nIndex = 0; + sal_Int32 nIndex = 0; aFont.SetName( aSearch.GetToken( 0, ';', nIndex ) ); but String::GetToken takes a reference to a 16bit xub_StrLen not a 32bit sal_Int32. You have to either leaves those inputs to String::GetToken alone or chage the String to a OUString and use OUString::getToken which does
Re: Notes 2 - Coming Our Way?
Hi Joel, On Thu, 2013-02-28 at 20:42 -0800, Joel Madero wrote: Users pointed me towards AOO Notes 2 and I was just wondering if those are going to make it into our code base and if so is there an ETA? The Notes2 work is what we have today in LibreOffice - it's old work done by Sun - the history on their wiki page shows no change since 2009 ;-) So we're not missing much of anything there :-) 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] libcdr.git: src/lib
src/lib/CDRParser.cpp |6 --
src/lib/CDRStylesCollector.cpp |7 ++-
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 6db42e0a640ee09e04a1980675bc1df4f7b79099
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 10:31:52 2013 +0100
Some more font encoding hackery
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 1ce77ae..99526c0 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -95,6 +95,8 @@ static void processNameForEncoding(WPXString name, unsigned
short encoding)
encoding = 0xcc;
else if ((found=fontName.rfind( Cyr)) != std::string::npos)
encoding = 0xcc;
+ else if ((found=fontName.rfind( CYR)) != std::string::npos)
+encoding = 0xcc;
else if ((found=fontName.rfind( Baltic)) != std::string::npos)
encoding = 0xba;
else if ((found=fontName.rfind( Greek)) != std::string::npos)
@@ -2348,8 +2350,8 @@ void libcdr::CDRParser::readFont(WPXInputStream *input,
unsigned length)
{
if (!_redirectX6Chunk(input, length))
throw GenericException();
- unsigned fontId = readU32(input);
- unsigned short fontEncoding = fontId 16;
+ unsigned short fontId = readU16(input);
+ unsigned short fontEncoding = readU16(input);
input-seek(14, WPX_SEEK_CUR);
WPXString name;
if (m_version = 1200)
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 1bbb1ea..8b45750 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -241,7 +241,12 @@ void
libcdr::CDRStylesCollector::collectPaletteEntry(unsigned colorId, unsigned
void libcdr::CDRStylesCollector::collectFont(unsigned fontId, unsigned short
encoding, const WPXString font)
{
- m_ps.m_fonts[fontId] = CDRFont(font, encoding);
+ std::mapunsigned, CDRFont::const_iterator iter = m_ps.m_fonts.find(fontId);
+ // Asume that the first font with the given ID is a font
+ // that we want, the others are substitution fonts. We might
+ // be utterly wrong in this one
+ if (iter == m_ps.m_fonts.end())
+m_ps.m_fonts[fontId] = CDRFont(font, encoding);
}
void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned
styleId, const std::vectorunsigned char data,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: undefined reference error while build
On 2013-03-01 11:24, Prashant Pandey wrote: The most recent issue I am having is that, I 'make', the cpu reaches this state and then does nothing (I left cpu for around 7 hours): What processes are running while it's stuck? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] not working, throws exception in config menu when trying to ...
Andras Timar has abandoned this change. Change subject: not working, throws exception in config menu when trying to write config key .. Patch Set 1: Abandoned Krisztian will send a new patch soon (2 patch merged into 1 plus corrections) -- To view, visit https://gerrit.libreoffice.org/2481 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2da740eeba796d630c58d209a3d685650096a206 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] autosave feature progress
Andras Timar has abandoned this change. Change subject: autosave feature progress .. Patch Set 1: Abandoned Krisztian will send a new patch soon (2 patch merged into 1 plus corrections) -- To view, visit https://gerrit.libreoffice.org/2480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I58e4d2e9d017ad6d6d0fda21c68447373dab12d4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Leftover dmake makefiles
On 03/01/2013 10:05 AM, Noel Grandin wrote:
On 2013-03-01 10:39, Stephan Bergmann wrote:
On 03/01/2013 12:35 AM, Peter Foley wrote:
We still have 153 dmake files left over in test, qa, and workben
directories.
Somebody should go through them and decide which of the various
examples, tests, etc. are worth keeping.
There's a few places, like desktop/test/deployment/{active,passive}/,
that I use every once in a while, but typically only adjust to any
changes that accumulated in the meantime whenever I actually want to
use it again.
Therefore, if it doesn't hurt too much, I'd prefer to not clean up too
aggressively there. (Sure, you can always resurrect removed stuff
from the repo, but, frankly, that can be a pain, esp. if you can't
remember /exactly/ what you are actually looking for and thus need to
grep around. Then again, other rotten places are so untouched for the
last decade that just removing them won't upset anybody.)
Maybe we can just cleanup any dmake files that haven't been touched for
X years, where X is whatever number you are comfortable with?
Yeah, that's what I meant with not too aggressively---if there's still
some signs of life in a place, it might make sense to leave it alone for
now.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.11'
Tag 'libcdr-0.0.11' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-03-01 09:41 -0800 Tagging 0.0.11 release Changes since libcdr-0.0.10-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk
download.lst |4 ++--
libcdr/UnpackedTarball_cdr.mk |6 --
libcdr/libcdr-0.0.10-ellipse.patch | 19 ---
3 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 8fad92201dc18592f2ffaecc798071f96fec82ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 10:38:31 2013 +0100
Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
diff --git a/download.lst b/download.lst
index f8aafde..df29934 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
-export CDR_TARBALL := libcdr-0.0.10.tar.bz2
+CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
+export CDR_TARBALL := libcdr-0.0.11.tar.bz2
MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 541fa96..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
- libcdr/libcdr-0.0.10-ellipse.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch
b/libcdr/libcdr-0.0.10-ellipse.patch
deleted file mode 100644
index 0b392a7..000
--- a/libcdr/libcdr-0.0.10-ellipse.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream
*input)
- double rx = fabs(cx);
- double ry = fabs(cy);
-
-+ while (angle1 0.0)
-+angle1 += 2*M_PI;
-+ while (angle1 2*M_PI)
-+angle1 -= 2*M_PI;
-+
-+ while (angle2 0.0)
-+angle2 += 2*M_PI;
-+ while (angle2 2*M_PI)
-+angle2 -= 2*M_PI;
-+
- if (angle1 != angle2)
- {
- if (angle2 angle1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/forms/controlpropertymap.cxx |4
xmloff/source/forms/elementexport.cxx | 54 ++--
xmloff/source/forms/elementimport.cxx |4
xmloff/source/forms/eventexport.cxx|4
xmloff/source/forms/eventimport.cxx| 14 -
xmloff/source/forms/formcellbinding.cxx|4
xmloff/source/forms/propertyexport.cxx |2
xmloff/source/forms/propertyexport.hxx |2
xmloff/source/forms/strings.hxx| 357 +
xmloff/source/forms/valueproperties.cxx| 69 ++---
10 files changed, 252 insertions(+), 262 deletions(-)
New commits:
commit 02944a639dd534e025e3dd57421b714bb816a28d
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 1 10:31:52 2013 +0100
xmloff: remove no longer needed XMLFORM_CONSTASCII_STRING macro
Change-Id: I92a341ccafb018b10e884bbaec07574b706a02b4
diff --git a/xmloff/source/forms/controlpropertymap.cxx
b/xmloff/source/forms/controlpropertymap.cxx
index d64b33d..2f0dc04 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -36,8 +36,8 @@ namespace xmloff
//.
#define MAP_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P( name, prefix, token, type, context ){ name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFVER_010 }
XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index d2a2dea..768c76a 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -181,7 +181,7 @@ namespace xmloff
::rtl::OUString sToWriteServiceName = sServiceName;
#define CHECK_N_TRANSLATE( name ) \
-else if
(sServiceName.equalsAsciiL(SERVICE_PERSISTENT_COMPONENT_##name.ascii,
SERVICE_PERSISTENT_COMPONENT_##name.length)) \
+else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \
sToWriteServiceName = SERVICE_##name
if (sal_False)
@@ -206,7 +206,7 @@ namespace xmloff
CHECK_N_TRANSLATE( HIDDENCONTROL );
CHECK_N_TRANSLATE( IMAGECONTROL );
CHECK_N_TRANSLATE( FORMATTEDFIELD );
-else if
(sServiceName.equalsAsciiL(SERVICE_PERSISTENT_COMPONENT_EDIT.ascii,
SERVICE_PERSISTENT_COMPONENT_EDIT.length))
+else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_EDIT))
{
// special handling for the edit field: we have two controls using
this as persistence service name
sToWriteServiceName = SERVICE_EDIT;
@@ -573,7 +573,7 @@ namespace xmloff
// the names of all properties which are expected to be of type
string
static ::rtl::OUString aStringPropertyNames[] =
{
-PROPERTY_LABEL, PROPERTY_TITLE
+OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE)
};
OSL_ENSURE(
sizeof(aStringPropertyNames)/sizeof(aStringPropertyNames[0]) ==
sizeof(nStringPropertyAttributeIds)/sizeof(nStringPropertyAttributeIds[0]),
@@ -601,9 +601,12 @@ namespace xmloff
{ // attribute flags
CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN,
CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
};
-static const ConstAsciiString pBooleanPropertyNames[] =
+static const OUString pBooleanPropertyNames[] =
{ // property names
-PROPERTY_STATE, PROPERTY_ENABLED, PROPERTY_DROPDOWN,
PROPERTY_PRINTABLE, PROPERTY_READONLY, PROPERTY_DEFAULT_STATE,
PROPERTY_TABSTOP, PROPERTY_ENABLEVISIBLE
+OUString(PROPERTY_STATE), OUString(PROPERTY_ENABLED),
+OUString(PROPERTY_DROPDOWN), OUString(PROPERTY_PRINTABLE),
+OUString(PROPERTY_READONLY), OUString(PROPERTY_DEFAULT_STATE),
+OUString(PROPERTY_TABSTOP), OUString(PROPERTY_ENABLEVISIBLE)
};
static sal_Bool nBooleanPropertyAttrFlags[] =
{ // attribute defaults
@@ -640,9 +643,9 @@ namespace xmloff
{ // attribute flags
[Libreoffice-commits] core.git: 3 commits - clucene/patches sd/source setup_native/Module_setup_native.mk
clucene/patches/clucene-narrowing-conversions.patch | 11 +++
sd/source/ui/remotecontrol/BluetoothServer.cxx |1 -
sd/source/ui/remotecontrol/BluetoothServer.hxx |2 ++
setup_native/Module_setup_native.mk |2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 8eeb0acb445641bfcad5066ed0561c35d7c1c2f7
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 1 10:52:19 2013 +0100
MinGW: Make mpImpl available only on Linux.
Change-Id: I35c3ccab01e4607510bd67628f4dfa94633aa8d7
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 926e4b2..0c6b208 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -593,7 +593,6 @@ BluetoothServer::BluetoothServer(
std::vectorCommunicator** pCommunicators )
#ifdef LINUX_BLUETOOTH
mpImpl.reset(new BluetoothServerImpl());
#endif
-(void) mpImpl; // Avoid warning: private field 'mpImpl' is not used
}
BluetoothServer::~BluetoothServer()
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx
b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index bfaeccc..756129a 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -42,7 +42,9 @@ namespace sd
enum { UNKNOWN, DISCOVERABLE, NOT_DISCOVERABLE } meWasDiscoverable;
static BluetoothServer *spServer;
+#ifdef LINUX_BLUETOOTH
boost::scoped_ptrBluetoothServerImpl mpImpl;
+#endif
virtual void SAL_CALL run();
void cleanupCommunicators();
commit 20c1d70fa5c87356bd95b8ac34ae12b8da31ab58
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 1 09:27:02 2013 +0100
MinGW: Workaround narrowing conversion in clucene.
Change-Id: I921d8140ecdf577687571a9aeca3100023f390d4
diff --git a/clucene/patches/clucene-narrowing-conversions.patch
b/clucene/patches/clucene-narrowing-conversions.patch
index f0e971c..64065ac 100644
--- a/clucene/patches/clucene-narrowing-conversions.patch
+++ b/clucene/patches/clucene-narrowing-conversions.patch
@@ -23,3 +23,14 @@
};
const int32_t QueryParserTokenManager::jjnextStates[]={
15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
+--- src/core/CLucene/queryParser/legacy/Lexer.cpp.sav 2013-03-01
09:25:18.0 +0100
src/core/CLucene/queryParser/legacy/Lexer.cpp 09:25:12.0 +0100
+@@ -117,7 +117,7 @@ bool Lexer::GetNextToken(QueryToken* tok
+ if( _istspace(ch)!=0 ) {
+ continue;
+ }
+- TCHAR buf[2] = {ch,'\0'};
++ TCHAR buf[2] = {TCHAR(ch),'\0'};
+ switch(ch) {
+ case '+':
+ token-set(buf, QueryToken::PLUS);
commit 52efa22867b6201a3d97180bfb76e4c780e923a2
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 1 09:14:11 2013 +0100
MinGW: Actually, this is usable only with MSVC.
Change-Id: Ida4715033f45f4857c8355b40878f9b05362a222
diff --git a/setup_native/Module_setup_native.mk
b/setup_native/Module_setup_native.mk
index 966dc60..4070657 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
))
endif
-ifeq ($(OS),WNT)
+ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,setup_native,\
Library_instooofiltmsi \
Library_jfregca \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] format paintbrush paragraph / character format
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2484 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/84/2484/1 format paintbrush paragraph / character format Add a paragraph to explain what formats are considered as paragraph and character format by the format paintbrush. See comment 9-10-11 of fdo#59029 Change-Id: I319007544d2361541a86e084ecf85c9e59973dcc --- M source/text/shared/guide/paintbrush.xhp 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/source/text/shared/guide/paintbrush.xhp b/source/text/shared/guide/paintbrush.xhp index 01d8248..9156ac6 100644 --- a/source/text/shared/guide/paintbrush.xhp +++ b/source/text/shared/guide/paintbrush.xhp @@ -57,6 +57,7 @@ /list paragraph xml-lang=en-US id=par_idN10716 role=tip l10n=NEWBy default only the character formatting is copied ; to include paragraph formatting, hold down switchinline select=syscaseinline select=MACCommand/caseinlinedefaultinlineCtrl/defaultinline/switchinline when you click. To copy only the paragraph formatting, hold down switchinline select=syscaseinline select=MACCommand /caseinlinedefaultinlineCtrl/defaultinline/switchinline+Shift when you click./paragraph + paragraph xml-lang=en-US id=par_idN10672 role=paragraph l10n=NEWThe emphparagraph/emph formats are the formats applied to the whole paragraph. The emphcharacter/emph format are those applied to a portion of the paragraph. For example if you apply the bold format to a whole paragraph the bold format is a emphparagraph/emph format. Then if you unblod a portion of this paragraph, the bold format is still a emphparagraph/emph format but the portion you unbold have an not bold emphcharacter/emph format./paragraph paragraph xml-lang=en-US id=par_idN10671 role=paragraph l10n=NEWThe following table describes the formatting attributes that the emphFormat Paintbrush/emph can copy:/paragraph table id=tbl_id599688 tablerow -- To view, visit https://gerrit.libreoffice.org/2484 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I319007544d2361541a86e084ecf85c9e59973dcc Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Maxime de Roucy mdero...@linagora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: postprocess/packconfig
postprocess/packconfig/packconfig.pl |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 5f632a87abd256e608cf568d035130c2cb19f4d3
Author: Tor Lillqvist t...@iki.fi
Date: Fri Mar 1 12:16:45 2013 +0200
Don't scribble into SRCDIR
Change-Id: I923a3dfe59bf4a16700c23bc22d14e3393f77b15
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index 372ba5e..0ce653d 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -217,12 +217,11 @@ sub create_zip_archive
print_message(creating config archive ...) if $verbose;
my $zip = Archive::Zip-new();
-# on Mac OS X Intel we have unxmacxi.pro, on Mac OS X PowerPC unxmacxp.pro
.. and so on
my $platform = $ENV{INPATH};
foreach ( sort keys %{$zip_hash_ref} ) {
my $path = $files_path/$_;
-# only Mac OS X Aqua is concerned here
+# only Mac OS X is concerned here
# but changes for other platforms can easely be added following the same
principle
if ( ( $platform =~ /^.*macx*/) ($path =~ /^.*menubar.xml/ ) ) {
$path = modify_mac_menus($path);
@@ -241,10 +240,7 @@ sub create_zip_archive
sub modify_mac_menus
{
-my $path_base = $ENV{'SOLARENV'};
-$path_base =~ s/solenv//;
-
-my $new_file_name =
$path_base.postprocess.\/.$ENV{INPATH}.\/.misc.\/.$_;
+my $new_file_name = $ENV{'WORKDIR'}/CustomTarget/postprocess/misc/$_;
my $new_directory = $new_file_name;
$new_directory =~ s/\/menubar.xml//;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Notes 2 - Coming Our Way?
On 01/03/13 10:26, Michael Meeks wrote: Hi Joel, On Thu, 2013-02-28 at 20:42 -0800, Joel Madero wrote: Users pointed me towards AOO Notes 2 and I was just wondering if those are going to make it into our code base and if so is there an ETA? The Notes2 work is what we have today in LibreOffice - it's old work done by Sun - the history on their wiki page shows no change since 2009 ;-) well it was mostly implemented by Max Odendahl and designed by Christoph Noack, both volunteers. So we're not missing much of anything there indeed. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Leftover dmake makefiles
On 01/03/13 10:05, Noel Grandin wrote:
On 2013-03-01 10:39, Stephan Bergmann wrote:
On 03/01/2013 12:35 AM, Peter Foley wrote:
We still have 153 dmake files left over in test, qa, and workben
directories.
Somebody should go through them and decide which of the various
examples, tests, etc. are worth keeping.
There's a few places, like desktop/test/deployment/{active,passive}/,
that I use every once in a while, but typically only adjust to any
changes that accumulated in the meantime whenever I actually want to
use it again.
Therefore, if it doesn't hurt too much, I'd prefer to not clean up too
aggressively there. (Sure, you can always resurrect removed stuff
from the repo, but, frankly, that can be a pain, esp. if you can't
remember /exactly/ what you are actually looking for and thus need to
grep around. Then again, other rotten places are so untouched for the
last decade that just removing them won't upset anybody.)
Maybe we can just cleanup any dmake files that haven't been touched for
X years, where X is whatever number you are comfortable with?
it doesn't make any sense to just remove dmake files in some directory
and leave the code around. maybe it needs special flags to build or
whatever. either remove the whole thing or leave the dmake file there
as documentation.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: README.cross
README.cross |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ef88d773d317ab020593f946706e291acee1d537 Author: Jan Holesovsky ke...@suse.cz Date: Fri Mar 1 11:55:15 2013 +0100 MinGW: Update the installation location. Change-Id: I5cdcfd8b906710c7ce756d7384fa21e4fcaa4ff6 diff --git a/README.cross b/README.cross index 0b82139..fd1e6ad 100644 --- a/README.cross +++ b/README.cross @@ -175,8 +175,8 @@ Once you have compiled it, you may want to try to run it, for instance using Wine: $ cd /tmp -$ tar xf your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US.tar.gz -$ cd LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev\ 3.6/program +$ tar xf your-build-dir/workdir/wntgcci.pro/installation/LibreOffice_Dev/archive/install/en-US/LibO-Dev_4.1.0.0.alpha0_Win_x86_archive.tar.gz +$ cd LibO-Dev_4.1.0.0.alpha0_Win_x86_archive/LOdev\ 4.1/program/ $ wine soffice.exe NB. it is important to unpack somewhere low in the hierarchy structure (like ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: README.cross
README.cross |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 256c4dec7b3e365ebfa68464c6ab05815ccdbe37 Author: Jan Holesovsky ke...@suse.cz Date: Fri Mar 1 11:57:04 2013 +0100 MinGW: 2 more paths updated. Change-Id: I0e987cc3490181c3cfed716c9a49104f46a35d82 diff --git a/README.cross b/README.cross index fd1e6ad..be22b2f 100644 --- a/README.cross +++ b/README.cross @@ -185,13 +185,13 @@ in /tmp as advised above), otherwise you'll get BerkeleyDB errors on startup. And if you are brave enough, you can even debug it. First you have to add the URE dll's to the wine's PATH using 'wine regedit' - see http://www.winehq.org/docs/wineusr-guide/environment-variables, and add -Z:\tmp\LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US\LOdev 3.6\URE\bin +Z:\tmp\LibO-Dev_4.1.0.0.alpha0_Win_x86_archive/LOdev\ 4.1\URE\bin to Path in My Computer-HKEY_CURRENT_USER-Environment. Then run linkoo, so that when you rebuild something, you can directly see the changes the next time you run it: -solenv/bin/linkoo '/tmp/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev 3.6' your_clone_dir +solenv/bin/linkoo '/tmp/LibO-Dev_4.1.0.0.alpha0_Win_x86_archive/LOdev\ 4.1' your_clone_dir And start debugging: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - Makefile.build Module_tail_build.mk RepositoryModule.mk solenv/gbuild
Makefile.build |2 Module_tail_build.mk| 271 RepositoryModule.mk | 271 solenv/gbuild/Module.mk |2 solenv/gbuild/tail_build_modules.mk | 52 -- 5 files changed, 273 insertions(+), 325 deletions(-) New commits: commit 2ee838d7ad7091fb3e24f362d791b7b59ca983f7 Author: Michael Stahl mst...@redhat.com Date: Fri Mar 1 00:54:25 2013 +0100 rename Module_tail_build to RepositoryModule Change-Id: I06783d26f10efabd1aca06a7a1e0647d8ed58b69 diff --git a/Makefile.build b/Makefile.build index a13aa83..322a7d7 100644 --- a/Makefile.build +++ b/Makefile.build @@ -14,6 +14,6 @@ endif gb_Side := host include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk)) +$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule.mk)) # vim: set noet sw=4 ts=4: diff --git a/Module_tail_build.mk b/Module_tail_build.mk deleted file mode 100644 index 538c5de..000 --- a/Module_tail_build.mk +++ /dev/null @@ -1,271 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Norbert Thiebaud nthieb...@gmail.com (C) 2011, All Rights Reserved. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - - -$(eval $(call gb_Module_Module,tail_build)) - -$(eval $(call gb_Module_add_moduledirs,tail_build,\ - accessibility \ - $(call gb_Helper_optional,AFMS,afms) \ - android \ - animations \ - $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ - apple_remote \ - autodoc \ - avmedia \ - basctl \ - basebmp \ - basegfx \ - basic \ - bean \ - $(call gb_Helper_optional,BOOST,boost) \ - $(call gb_Helper_optional,BSH,beanshell) \ - binaryurp \ - $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ - bridges \ - $(call gb_Helper_optional,CAIRO,cairo) \ - canvas \ - chart2 \ - cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ - comphelper \ - configmgr \ - connectivity \ - cosv \ - cppcanvas \ - cppu \ - cppuhelper \ - $(call gb_Helper_optional,CPPUNIT,cppunit) \ - cpputools \ - $(call gb_Helper_optional,CRASHREP,crashrep) \ - $(call gb_Helper_optional,CT2N,ct2n) \ - cui \ - $(call gb_Helper_optional,CURL,curl) \ - dbaccess \ - desktop \ - $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ - dtrans \ - drawinglayer \ - editeng \ - embeddedobj \ - embedserv \ - $(call gb_Helper_optional,EPM,epm) \ - eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ - extensions \ - external \ - extras \ - fileaccess \ - filter \ - $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ - forms \ - formula \ - fpicker \ - framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ - $(call gb_Helper_optional,GRAPHITE,graphite) \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ - $(call gb_Helper_optional,HELP,helpcontent2) \ - $(call gb_Helper_optional,HSQLDB,hsqldb) \ - $(call gb_Helper_optional,HUNSPELL,hunspell) \ - hwpfilter \ - $(call gb_Helper_optional,HYPHEN,hyphen) \ - i18npool \ - i18nutil \ - $(call gb_Helper_optional,ICU,icu) \ - idl \ - $(call gb_Helper_optional,DESKTOP,idlc) \ - instsetoo_native \ - io \ - ios \ - javaunohelper \ - $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ - $(call gb_Helper_optional,JPEG,jpeg) \ - jurt \ - jvmaccess \ - jvmfwk \ - $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,LCMS2,lcms2) \ - $(call gb_Helper_optional,CDR,libcdr) \ - $(call gb_Helper_optional,CMIS,libcmis) \ - $(call
Translation of German comments of the files in sd/source/filter/eppt/
Translation of German comments of the files in sd/source/filter/eppt/
Regards
Urs
From 8b21434d884bfaf3e11e566dd1dee3c14fadc53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Fri, 1 Mar 2013 10:58:56 +0100
Subject: [PATCH 15/24] translation of German comments in files
sd/source/filter/eppt/eppt.*
Change-Id: Ied95b179972106402fde3f9d82f6c4844571fa3a
---
sd/source/filter/eppt/eppt.cxx | 50
sd/source/filter/eppt/eppt.hxx | 16 ++---
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 5d8959a..d98cdda 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -90,7 +90,7 @@ void PPTWriter::exportPPTPre( const std::vector com::sun::star::beans::Property
if ( !mrStg.Is() )
return;
-// MasterPages + Slides und Notizen + NotesMasterPage
+// master pages + slides and notes + notes master page
mnDrawings = mnMasterPages + ( mnPages 1 ) + 1;
if ( mXStatusIndicator.is() )
@@ -169,9 +169,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx-OpenContainer( EPP_Slide );
mpPptEscherEx-AddAtom( 24, EPP_SlideAtom, 2 );
*mpStrm rLayout.nLayout;
-mpStrm-Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs ( 8Stueck )
-*mpStrm (sal_uInt32)(nMasterNum | 0x8000)// master ID ( ist gleich 0x8000 bei einer masterpage )
- (sal_uInt32)nPageNum + 0x100 // notes ID ( ist gleich null wenn keine notizen vorhanden )
+mpStrm-Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts)
+*mpStrm (sal_uInt32)(nMasterNum | 0x8000)// master ID (equals 0x8000 on a master page)
+ (sal_uInt32)nPageNum + 0x100 // notes ID (equals null if no notes are present)
nMode
(sal_uInt16)0; // padword
@@ -185,12 +185,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
switch ( *(sal_Int32*)aAny.getValue() )
{
-case 1 :// automatisch
+case 1 :// automatic
mnDiaMode++;
-case 2 :// halbautomatisch
+case 2 :// semi-automatic
mnDiaMode++;
default :
-case 0 :// manuell
+case 0 :// manual
break;
}
}
@@ -226,7 +226,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_uInt8 nDirection = 0;
sal_uInt8 nTransitionType = 0;
sal_uInt16 nBuildFlags = 1;// advange by mouseclick
-sal_Int32 nSlideTime = 0; // muss noch !!!
+sal_Int32 nSlideTime = 0; // still has to !!!
sal_uInt8 nSpeed = 1;
if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( Speed ) ) )
@@ -277,7 +277,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx-OpenContainer( EPP_PPDrawing );
mpPptEscherEx-OpenContainer( ESCHER_DgContainer );
mpPptEscherEx-EnterGroup(0,0);
-ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum );// Die Shapes der Seite werden im PPT Dok. erzeugt
+ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum );// the shapes of the pages are created in the PPT document
mpPptEscherEx-LeaveGroup();
if ( bHasBackground )
@@ -358,8 +358,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference XPropertyS
mpPptEscherEx-AddAtom( 24, EPP_SlideAtom, 2 );
*mpStrm (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout - title and body slide
(sal_uInt8)1 (sal_uInt8)2 (sal_uInt8)0 (sal_uInt8)0 (sal_uInt8)0 (sal_uInt8)0 (sal_uInt8)0 (sal_uInt8)0 // placeholderID
- (sal_uInt32)0// master ID ( ist gleich null bei einer masterpage )
- (sal_uInt32)0// notes ID ( ist gleich null wenn keine notizen vorhanden )
+ (sal_uInt32)0// master ID (equals null at a master page)
+ (sal_uInt32)0// notes ID (equals null if no notes are present)
(sal_uInt16)0// Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
(sal_uInt16)0; // padword
@@ -418,7 +418,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference XPropertyS
mpPptEscherEx-OpenContainer( ESCHER_DgContainer );
mpPptEscherEx-EnterGroup(0,0);
-ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True );// Die Shapes der Seite werden im PPT Dok. erzeugt
+ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True );// the shapes of the pages are
[PATCH] Translation of German comments of the files in sd/source/filter/grf/
Translation of German comments of the files in sd/source/filter/grf/
Regards
Urs
From eeda6483f4c2b9eb3cd845a491783305ebddb30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Fri, 1 Mar 2013 11:01:54 +0100
Subject: [PATCH 19/24] translation of German comments in file
sd/source/filter/grf/sdgrffilter.cxx
Change-Id: Ibab526eae24decc208c74173555e75bb00ac50f9
---
sd/source/filter/grf/sdgrffilter.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 31f3b57..8a4ac2f 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -224,7 +224,7 @@ sal_Bool SdGRFFilter::Import()
double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height();
double fWinWH = (double) aPagSize.Width() / aPagSize.Height();
-// Grafik an Pagesize anpassen (skaliert)
+// adjust graphic to page size (scales)
if( fGrfWH fWinWH )
{
aGrfSize.Width() = (long) ( aPagSize.Height() * fGrfWH );
@@ -237,7 +237,7 @@ sal_Bool SdGRFFilter::Import()
}
}
-// Ausgaberechteck fuer Grafik setzen
+// set output rectangle for graphic
aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) 1 ) + pPage-GetLftBorder();
aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) 1 ) + pPage-GetUppBorder();
--
1.7.10.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translation of German comments of the files in sd/source/filter/html/
Translation of German comments of the files in sd/source/filter/html/
Regards
Urs
From ec83e6c015aad134a56a94545b15bf901678a50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Fri, 1 Mar 2013 11:05:05 +0100
Subject: [PATCH 20/24] translation of German comments in file
sd/source/filter/html/htmlex.cxx
Change-Id: I8e432ce2f7a68c51da809b3f68c1924fda6b63c8
---
sd/source/filter/html/htmlex.cxx | 232 +++---
1 file changed, 115 insertions(+), 117 deletions(-)
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 943645d..9988797 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -93,12 +93,12 @@ using namespace ::com::sun::star::document;
#define KEY_QUALITY JPG-EXPORT-QUALITY
-// Parameter aus Itemset abfragen
+// get parameter from Itemset
#define RESTOHTML( res ) StringToHTMLString(String(SdResId(res)))
#define S2H( str ) StringToHTMLString( str )
-// bei Aenderungen auch NUM_BUTTONS in pubdlg.hxx aendern!!
+// when changing, also change NUM_BUTTONS in pubdlg.hxx!!
const char *pButtonNames[NUM_BUTTONS] =
{
first-inactive.png,
@@ -129,7 +129,7 @@ const char *pButtonNames[NUM_BUTTONS] =
#define BTN_LESS11
// *
-// Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote
+// Helper class for the simple creation of files local/remote
// *
class EasyFile
{
@@ -149,7 +149,7 @@ public:
};
// *
-// Hilfsklasse fuer das einbinden von Textattributen in die Html-Ausgabe
+// Helper class for the embedding of text attributes into the html output
// *
class HtmlState
{
@@ -178,7 +178,7 @@ public:
};
// =
-// alle noch offennen Tags schliessen
+// close all still open tags
// =
String HtmlState::Flush()
{
@@ -195,7 +195,7 @@ String HtmlState::Flush()
}
// =
-// c'tor mit Defaultfarbe fuer die Seite
+// c'tor with default color for the page
// =
HtmlState::HtmlState( Color aDefColor )
{
@@ -209,7 +209,7 @@ HtmlState::HtmlState( Color aDefColor )
}
// =
-// aktiviert/deaktiviert Fettdruck
+// enables/disables bold print
// =
String HtmlState::SetWeight( bool bWeight )
{
@@ -225,7 +225,7 @@ String HtmlState::SetWeight( bool bWeight )
}
// =
-// aktiviert/deaktiviert Italic
+// enables/disables italic
// =
String HtmlState::SetItalic( bool bItalic )
{
@@ -241,7 +241,7 @@ String HtmlState::SetItalic( bool bItalic )
}
// =
-// aktiviert/deaktiviert Unterstrichen
+// enables/disables underlines
// =
String HtmlState::SetUnderline( bool bUnderline )
{
@@ -257,7 +257,7 @@ String HtmlState::SetUnderline( bool bUnderline )
}
// =
-// aktiviert/deaktiviert Durchstreichen
+// enables/disables strike through
// =
String HtmlState::SetStrikeout( bool bStrike )
{
@@ -273,7 +273,7 @@ String HtmlState::SetStrikeout( bool bStrike )
}
// =
-// Setzt die angegebenne Textfarbe
+// Sets the specified text color
// =
String HtmlState::SetColor( Color aColor )
{
@@ -303,7 +303,7 @@ String HtmlState::SetColor( Color aColor )
}
// =
-// aktiviert/deaktiviert einen Hyperlink
+// enables/disables a hyperlink
// =
String HtmlState::SetLink( const String aLink, const String aTarget )
{
@@ -337,7 +337,7 @@ String HtmlState::SetLink( const String aLink, const String aTarget )
}
// *
-// class HtmlExport Methoden
+// methods of the class HtmlExport
// *
static String getParagraphStyle( SdrOutliner* pOutliner, sal_uInt16 nPara )
@@ -357,7
[PATCH] Translation of German comments of the files in sd/source/filter/ppt/
Translation of German comments of the files in sd/source/filter/ppt/
Regards
Urs
From 34ee897c6a1dc5385d7f444d6453fd9ff2a50b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Fri, 1 Mar 2013 11:07:37 +0100
Subject: [PATCH 22/24] translation of German comments in file
sd/source/filter/ppt/pptin.cxx
Change-Id: I3849f4078930c88dda19d569d9544851a395a0ea
---
sd/source/filter/ppt/pptin.cxx | 173
1 file changed, 86 insertions(+), 87 deletions(-)
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0925969..05f6d76 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -505,7 +505,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( mbDocumentFound )
{
rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 );
-// HyperList lesen / Indexe der einzelnen Eintraege setzen
+// read hyperlist / set indices of the entries
DffRecordHeader aHyperHd;
if ( SeekToRec( rStCtrl, PPT_PST_ExObjList, maDocHd.GetRecEndFilePos(), aHyperHd ) )
{
@@ -597,18 +597,18 @@ sal_Bool ImplSdPPTImport::Import()
///
// create layoutstylesheets, set layoutname and stylesheet
-// (nur auf Standard- und Notizseiten)
+// (only on standard and not pages)
///
String aLayoutName( SdResId( STR_LAYOUT_DEFAULT_NAME ) );
if ( nMasterNum 2 )
{
if ( ePgKind == PK_STANDARD )
-{ // Standardseite: Neues Praesentationslayout erzeugen
+{ // standard page: create new presentation layout
aLayoutName = String( SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME ) );
aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
( (SdStyleSheetPool*)mpDoc-GetStyleSheetPool() )-CreateLayoutStyleSheets( aLayoutName );
}
-else// Notizseite: Praesentationslayout von der Standardseite verwenden
+else// note page: use presentation layout of standard page
aLayoutName = ( (SdPage*)mpDoc-GetMasterPage( nMasterNum - 1 ) )-GetName();
}
pPage-SetName( aLayoutName );
@@ -994,7 +994,7 @@ sal_Bool ImplSdPPTImport::Import()
}
else
{
-// Das kann bei Dokumentvorlagen vorkommen
+// that can happen by document templates
eAktPageKind = PPT_SLIDEPAGE;
SdrPage* pPage = MakeBlancPage( sal_False );
pSdrModel-InsertPage( pPage );
@@ -1031,7 +1031,7 @@ sal_Bool ImplSdPPTImport::Import()
rStCtrl.Seek( nFPosMerk );
}
///
-// Handzettel und Notiz-Seiten erzeugen //
+// create handout and note pages //
///
bOk = mpDoc-CreateMissingNotesAndHandoutPages();
if ( bOk )
@@ -1047,7 +1047,7 @@ sal_Bool ImplSdPPTImport::Import()
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
if ( pSlideLayout )
{
-switch ( pSlideLayout-eLayout )// Praesentationslayouts fuer Standard-Seiten
+switch ( pSlideLayout-eLayout )// presentation layout for standard pages
{
case PPT_LAYOUT_TITLEANDBODYSLIDE :
{
@@ -1145,11 +1145,11 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_BOTTOMROW2COLUMNS :
case PPT_LAYOUT_BLANCSLIDE :
-case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage
+case PPT_LAYOUT_MASTERSLIDE : // layout of the standard and title master page
case PPT_LAYOUT_TITLEMASTERSLIDE :
-case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage
-case PPT_LAYOUT_NOTESTITLEBODY :// Praesentationslayout fuer Notiz-Seiten
-case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten
+case PPT_LAYOUT_MASTERNOTES : // layout of the note master page
+case PPT_LAYOUT_NOTESTITLEBODY :// presentation layout for note pages
+case PPT_LAYOUT_HANDOUTLAYOUT : // presentation layout for handout
eAutoLayout = AUTOLAYOUT_NONE;
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 23 +++
sd/source/ui/remotecontrol/BluetoothServer.hxx |8 ++--
2 files changed, 13 insertions(+), 18 deletions(-)
New commits:
commit 846e0f15635bfa361d2ff32dbd77b2edcef7854f
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 1 12:19:22 2013 +0100
sd: BluetoothServer: put the ifdeffery in the right place
Change-Id: Ide62e3624271c3550e17ea2386363cffe8c2897d
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 0c6b208..fa919ab 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -14,10 +14,6 @@
#include sal/log.hxx
-#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
-# define LINUX_BLUETOOTH
-#endif
-
#ifdef LINUX_BLUETOOTH
#include glib.h
#include dbus/dbus.h
@@ -93,18 +89,18 @@ struct DBusObject {
}
};
-struct sd::BluetoothServerImpl {
+struct sd::BluetoothServer::Impl {
// the glib mainloop running in the thread
GMainContext *mpContext;
DBusConnection *mpConnection;
DBusObject *mpService;
volatile bool mbExitMainloop;
-BluetoothServerImpl() :
-mpContext( g_main_context_new() ),
-mpConnection( NULL ),
-mpService( NULL ),
-mbExitMainloop( false )
+Impl()
+: mpContext( g_main_context_new() )
+, mpConnection( NULL )
+, mpService( NULL )
+, mbExitMainloop( false )
{ }
DBusObject *getAdapter()
@@ -579,11 +575,6 @@ registerWithDefaultAdapter( DBusConnection *pConnection )
return pService;
}
-#else
-
-// MSVC needs this definition even though it's never used
-struct sd::BluetoothServerImpl { };
-
#endif // LINUX_BLUETOOTH
BluetoothServer::BluetoothServer( std::vectorCommunicator** pCommunicators )
@@ -591,7 +582,7 @@ BluetoothServer::BluetoothServer(
std::vectorCommunicator** pCommunicators )
mpCommunicators( pCommunicators )
{
#ifdef LINUX_BLUETOOTH
-mpImpl.reset(new BluetoothServerImpl());
+mpImpl.reset(new BluetoothServer::Impl());
#endif
}
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx
b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index 756129a..9d417d4 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -14,11 +14,14 @@
#include boost/scoped_ptr.hpp
+#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
+# define LINUX_BLUETOOTH
+#endif
+
namespace sd
{
class Communicator;
-struct BluetoothServerImpl;
class BluetoothServer:
public osl::Thread
{
@@ -43,7 +46,8 @@ namespace sd
static BluetoothServer *spServer;
#ifdef LINUX_BLUETOOTH
-boost::scoped_ptrBluetoothServerImpl mpImpl;
+struct Impl;
+boost::scoped_ptrImpl mpImpl;
#endif
virtual void SAL_CALL run();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/filedlg2.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 9509f5c7923ebd9a95068dd7b9231af79080b6bf
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Mar 1 12:18:01 2013 +0100
Useless assignment + use setWidth
See
http://nabble.documentfoundation.org/Cppcheck-reports-nMaxWidth-is-assigned-a-value-never-used-svtools-module-td4036771.html
Change-Id: I987f1c6b107291b93875cc169f2a72e249fe2ad5
diff --git a/svtools/source/dialogs/filedlg2.cxx
b/svtools/source/dialogs/filedlg2.cxx
index b46f324..ebc9d35 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -545,7 +545,7 @@ void ImpPathDialog::PreExecute()
{
Size aDlgSize = GetPathDialog()-GetOutputSizePixel();
GetPathDialog()-SetOutputSizePixel( Size(
aDlgSize.Width()+nMaxWidth-aSize.Width(), aDlgSize.Height() ) );
-aSize.Width() = nMaxWidth;
+aSize.setWidth(nMaxWidth);
if( pOkBtn )
pOkBtn-SetSizePixel( aSize );
@@ -554,8 +554,6 @@ void ImpPathDialog::PreExecute()
if( pLoadBtn )
pLoadBtn-SetSizePixel( aSize );
}
-else
-nMaxWidth = aSize.Width();
for ( n = nOwnChildren; n nChildren; n++ )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: Cppcheck reports 'nMaxWidth' is assigned a value never used (svtools module)
On 28/02/2013 12:58, Caolán McNamara wrote:
On Tue, 2013-02-12 at 08:13 -0800, julien2412 wrote:
544 if( nMaxWidth aSize.Width() )
545 {
...
556 }
557 else
558 nMaxWidth = aSize.Width();
see
http://opengrok.libreoffice.org/xref/core/svtools/source/dialogs/filedlg2.cxx#544
Any idea what should be done with this?
It's another been like this since day 0, go ahead and remove the
does-nothing else branch. (The exciting manual move of widgets around
and determination of the size etc can all eventually go if it gets
converted to the widget layout stuff)
I noticed these lines in tools/inc/tools/gen.hxx:
longWidth() const { return nA; }
long Width() const { return nA; }
I must recognize I don't understand the interest since there's a setWidth
function
and setWidth just calls the second Width() variant. I can only speculate
it was an ancient abandoned incremental cleanup effort to remove one or
the other.
As usual, thank you for your feedback Caolán! :-)
I pushed a commit on master, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9509f5c7923ebd9a95068dd7b9231af79080b6bf
Finally, I replaced Width() by setWidth method to make it clearer.
Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted
Hello everyone, I have added my first real code for submission to LO :-) It's in gerrit: https://gerrit.libreoffice.org/2476. It took me a while to find my way around the code and also to get used to the new possibilities in C++. I looked on the LO website to find some pointers around in the code, but didn't really found it. My main helpers were OpenGrok and gdb. Did I miss a nice overview of where to find which functionality ? Secondly, what would you recommend as a primer on the C++ functionalities used in LO code + how they are used ? I didn't do that advanced C++ coding before that I know a lot about templates and namespaces. I also want to add some debug code in what I have done, mainly to print a warning if new curve types are fed to LO. What's the best way to do that ? From https://wiki.documentfoundation.org/Development/How_to_debug#Macros_Controlling_Debug_Code I would think to add the code in #ifdef SAL_LOG_WARN or use the SAL_WARN macro. Anyway, I will now create a mock for the UI and discuss this on the UI list. Once this is done, what would be the best way to add the new UI functionality ? A friendly push in the right direction would save me quite some time ;-) Thanks, Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2485
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2485/1
Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
(cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
---
M download.lst
M libcdr/UnpackedTarball_cdr.mk
D libcdr/libcdr-0.0.10-ellipse.patch
3 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/download.lst b/download.lst
index 75d928c..0420af9 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
-export CDR_TARBALL := libcdr-0.0.10.tar.bz2
+CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
+export CDR_TARBALL := libcdr-0.0.11.tar.bz2
MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 541fa96..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
- libcdr/libcdr-0.0.10-ellipse.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch
b/libcdr/libcdr-0.0.10-ellipse.patch
deleted file mode 100644
index 0b392a7..000
--- a/libcdr/libcdr-0.0.10-ellipse.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream
*input)
- double rx = fabs(cx);
- double ry = fabs(cy);
-
-+ while (angle1 0.0)
-+angle1 += 2*M_PI;
-+ while (angle1 2*M_PI)
-+angle1 -= 2*M_PI;
-+
-+ while (angle2 0.0)
-+angle2 += 2*M_PI;
-+ while (angle2 2*M_PI)
-+angle2 -= 2*M_PI;
-+
- if (angle1 != angle2)
- {
- if (angle2 angle1)
--
To view, visit https://gerrit.libreoffice.org/2485
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/inc sd/sdi
sd/inc/app.hrc |8
sd/inc/diadef.h |2 +-
sd/inc/fadedef.h|4 ++--
sd/inc/glob.hxx | 10 +-
sd/inc/helpids.h|2 +-
sd/inc/prlayout.hxx |6 +++---
sd/inc/sdattr.hrc | 18 +-
sd/inc/sdattr.hxx |2 +-
sd/inc/sdiocmpt.hxx |4 ++--
sd/inc/sdmod.hxx|2 +-
sd/inc/stlpool.hxx |2 +-
sd/sdi/_drvwsh.sdi | 26 +-
sd/sdi/grdocsh.sdi |2 +-
sd/sdi/outlnvsh.sdi | 20 ++--
14 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit a0f8fa87a550caf348cd30bfcecb0fd050564099
Author: Urs Fässler u...@bitzgi.ch
Date: Fri Mar 1 10:14:00 2013 +0100
translation of German comments of the files in sd/sdi/
Change-Id: Ifc7de73dfeb4e12cbe76237558904f4f1f4b130e
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 98f1539..a67acf1 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -111,7 +111,7 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- // Menue-Messages fuer temporaere Funktionen mit Dialog
+ // Menu messages for temporary functions with dialog
SID_ATTR_ZOOM // ole : no, status : no
[
ExecMethod = FuTemporary ;
@@ -1228,7 +1228,7 @@ interface DrawView
Export = FALSE ;
]
//
- // Beginn FormSlots
+ // Begin FormSlots
SID_FM_CREATE_CONTROL
[
ExecMethod = FuPermanent ;
@@ -1243,7 +1243,7 @@ interface DrawView
ExecMethod = ExecCtrl ;
StateMethod = GetCtrlState ;
]
- // Ende FormSlots
+ // End FormSlots
//
SID_ATTR_FILL_STYLE // ole : no, status : ?
[
@@ -1681,9 +1681,9 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- // Problem mit SID_ATTR_FILL_STYLE:
- // frueher XFillStyle, jetzt Property FillStyle (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_FILL_STYLE:
+ // former XFillStyle, now property FillStyle (Get/Set)
+ // therefore Export = FALSE !
SID_SETFILLSTYLE // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1705,9 +1705,9 @@ interface DrawView
ExecMethod = AttrExec ;
StateMethod = AttrState ;
]
- // Problem mit SID_ATTR_LINE_WIDTH:
- // frueher XLineWidth, jetzt Property LineWidth (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_LINE_WIDTH:
+ // former XLineWidth, now property LineWidth (Get/Set)
+ // therefore Export = FALSE !
SID_SETLINEWIDTH // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1720,9 +1720,9 @@ interface DrawView
StateMethod = AttrState ;
]
//DB: FillColor - SetFillColor
- // Problem mit SID_ATTR_FILL_COLOR:
- // frueher XFillColor, jetzt Property FillColor (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_FILL_COLOR:
+ // former XFillColor, now property FillColor (Get/Set)
+ // therefore Export = FALSE !
SID_SETFILLCOLOR // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1939,7 +1939,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- // Slots in der Optionsleiste
+ // slots in the option pane
SID_BEZIER_EDIT // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index ed508a6..6f17114 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -18,7 +18,7 @@
interface GraphicDocument : DrawDocument
[
-uuid ( D7474100-ACDF-11D0-89CB-008029E4B0B1 ) ; // erzeug am 04.04.97
+uuid ( D7474100-ACDF-11D0-89CB-008029E4B0B1 ) ; // created at 04.04.97
]
{
}
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index dbe34ed..68c3b52 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -250,8 +250,8 @@ interface OutlineView
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
]
- // Vorlagen
- // kein Menueeintrag
+ // Templates
+ // no menu entry
SID_STYLE_FAMILY2 // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -266,14 +266,14 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // Vorlagen
- // kein Menueeintrag
+ // Templates
+ // no menu entry
SID_STYLE_FAMILY5 // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetAttrState ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_EDIT // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -281,7 +281,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein
[Libreoffice-commits] core.git: 2 commits - sd/source xmloff/source
sd/source/ui/unoidl/unomodel.cxx | 58 +
xmloff/source/draw/sdxmlexp.cxx | 68 +++
xmloff/source/draw/sdxmlexp_impl.hxx |1
3 files changed, 112 insertions(+), 15 deletions(-)
New commits:
commit b40bcde076f9fabf24810d2520e878d604d99637
Author: Radek Doulik r...@novell.com
Date: Fri Mar 1 13:03:06 2013 +0100
finish font embedding, use the new Fonts document property
Change-Id: I4cd6b8c11fb1efe9f97d2c5e474bd0bdcc9ed505
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ca33ff0..5ffed47 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1806,6 +1806,12 @@ void SdXMLExport::_ExportMeta()
//
+void SdXMLExport::_ExportFontDecls()
+{
+GetFontAutoStylePool(); // make sure the pool is created
+SvXMLExport::_ExportFontDecls();
+}
+
void SdXMLExport::_ExportContent()
{
// export pres:header-decl, pres:footer-decl and pres:date-time-decl
elements
@@ -2807,25 +2813,25 @@ uno::Reference uno::XInterface SAL_CALL
classname##_createInstance(const uno:
}
SERVICE( XMLImpressExportOasis, com.sun.star.comp.Impress.XMLOasisExporter,
XMLImpressExportOasis, sal_False,
EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED
);
-SERVICE( XMLImpressStylesExportOasis,
com.sun.star.comp.Impress.XMLOasisStylesExporter,
XMLImpressStylesExportOasis, sal_False,
EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES );
+SERVICE( XMLImpressStylesExportOasis,
com.sun.star.comp.Impress.XMLOasisStylesExporter,
XMLImpressStylesExportOasis, sal_False,
EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS
);
SERVICE( XMLImpressContentExportOasis,
com.sun.star.comp.Impress.XMLOasisContentExporter,
XMLImpressContentExportOasis, sal_False,
EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
SERVICE( XMLImpressMetaExportOasis,
com.sun.star.comp.Impress.XMLOasisMetaExporter, XMLImpressMetaExportOasis,
sal_False, EXPORT_OASIS|EXPORT_META );
SERVICE( XMLImpressSettingsExportOasis,
com.sun.star.comp.Impress.XMLOasisSettingsExporter,
XMLImpressSettingsExportOasis, sal_False, EXPORT_OASIS|EXPORT_SETTINGS );
SERVICE( XMLImpressExportOOO, com.sun.star.comp.Impress.XMLExporter,
XMLImpressExportOOO, sal_False,
EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED
);
-SERVICE( XMLImpressStylesExportOOO,
com.sun.star.comp.Impress.XMLStylesExporter, XMLImpressStylesExportOOO,
sal_False, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES );
+SERVICE( XMLImpressStylesExportOOO,
com.sun.star.comp.Impress.XMLStylesExporter, XMLImpressStylesExportOOO,
sal_False, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS
);
SERVICE( XMLImpressContentExportOOO,
com.sun.star.comp.Impress.XMLContentExporter, XMLImpressContentExportOOO,
sal_False, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
SERVICE( XMLImpressMetaExportOOO, com.sun.star.comp.Impress.XMLMetaExporter,
XMLImpressMetaExportOOO, sal_False, EXPORT_META );
SERVICE( XMLImpressSettingsExportOOO,
com.sun.star.comp.Impress.XMLSettingsExporter, XMLImpressSettingsExportOOO,
sal_False, EXPORT_SETTINGS );
SERVICE( XMLDrawExportOasis, com.sun.star.comp.Draw.XMLOasisExporter,
XMLDrawExportOasis, sal_True,
EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED
);
-SERVICE( XMLDrawStylesExportOasis,
com.sun.star.comp.Draw.XMLOasisStylesExporter, XMLDrawStylesExportOasis,
sal_True, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES );
+SERVICE( XMLDrawStylesExportOasis,
com.sun.star.comp.Draw.XMLOasisStylesExporter, XMLDrawStylesExportOasis,
sal_True,
EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS
);
SERVICE( XMLDrawContentExportOasis,
com.sun.star.comp.Draw.XMLOasisContentExporter, XMLDrawContentExportOasis,
sal_True,
EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
SERVICE( XMLDrawMetaExportOasis,
com.sun.star.comp.Draw.XMLOasisMetaExporter, XMLDrawMetaExportOasis,
sal_True, EXPORT_OASIS|EXPORT_META );
SERVICE( XMLDrawSettingsExportOasis,
com.sun.star.comp.Draw.XMLOasisSettingsExporter,
XMLDrawSettingsExportOasis, sal_True, EXPORT_OASIS|EXPORT_SETTINGS );
SERVICE( XMLDrawExportOOO, com.sun.star.comp.Draw.XMLExporter,
XMLDrawExportOOO, sal_True,
EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED
);
-SERVICE( XMLDrawStylesExportOOO,
[Libreoffice-commits] core.git: 4 commits - sd/source
sd/source/core/glob.src | 12 ++--
sd/source/core/pglink.cxx | 14 ++--
sd/source/core/sdiocmpt.cxx |2
sd/source/core/sdpage.cxx | 132 ++--
4 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 4c5e85403955da8bbafaa4b58486130e12e73c65
Author: Urs Fässler u...@bitzgi.ch
Date: Fri Mar 1 10:53:55 2013 +0100
translation of German comments in file sd/source/core/sdpage.cxx
Change-Id: If75c2f867cbbb0b1d0d3ed83f4439da5f1875eeb
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 399c1fd..cd7d6c1 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -106,9 +106,9 @@ SdPage::SdPage(SdDrawDocument rNewDoc, StarBASIC* pBasic,
sal_Bool bMasterPage)
, mfTransitionDuration(2.0)
, mbIsPrecious(true)
{
-// Der Layoutname der Seite wird von SVDRAW benutzt, um die Praesentations-
-// vorlagen der Gliederungsobjekte zu ermitteln. Darum enthaelt er bereits
-// den Bezeichner fuer die Gliederung (STR_LAYOUT_OUTLINE).
+// The name of the layout of the page is used by SVDRAW to determine the
+// presentation template of the outline objects. Therefore, it already
+// contains the designator for the outline (STR_LAYOUT_OUTLINE).
OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME).toString());
aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString());
maLayoutName = aBuf.makeStringAndClear();
@@ -344,7 +344,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
case PRESOBJ_HANDOUT:
{
-//Erste Standardseite am SdrPageObj vermerken
+// Save the first standard page at SdrPageObj
// #i105146# We want no content to be displayed for PK_HANDOUT,
// so just never set a page as content
pSdrObj = new SdrPageObj(0);
@@ -353,7 +353,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
case PRESOBJ_PAGE:
{
-//Notizseite am SdrPageObj vermerken
+// Save note pages at SdrPageObj
sal_uInt16 nDestPageNum(GetPageNum());
if(nDestPageNum)
@@ -411,8 +411,8 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
if (mbMaster)
{
-// Bei Praesentationsobjekten auf der MasterPage soll die
-// Groesse vom Benutzwer frei waehlbar sein
+// The size of presentation objects on the master page have to
+// be freely selectable by the user.
// potential problem: This action was still NOT
// adapted for vertical text. This sure needs to be done.
@@ -490,12 +490,12 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
{
SdrLayerAdmin rLayerAdmin = pModel-GetLayerAdmin();
-// Hintergrundobjekte der MasterPage
+// background objects of the master page
pSdrObj-SetLayer( rLayerAdmin.
GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False) );
}
-// Objekt am StyleSheet anmelden
+// Subscribe object at the style sheet
// Set style only when one was found (as in 5.2)
if( mePageKind != PK_HANDOUT )
{
@@ -553,8 +553,8 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
/*
|*
-|* Es werden Praesentationsobjekte auf der Page erzeugt.
-|* Alle Praesentationsobjekte erhalten einen UserCall auf die Page.
+|* Creates presentation objects on the master page.
+|* All presentation objects get a UserCall to the page.
|*
\/
@@ -670,9 +670,9 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32
nHelpId ) const
/*
|*
-|* Das Praesentationsobjekt rObj hat sich geaendert und wird nicht mehr
-|* durch das Praesentationsobjekt der MasterPage referenziert.
-|* Der UserCall wird geloescht.
+|* The presentation object rObj has changed and is no longer referenzed by the
+|* presentation object of the master page.
+|* The UserCall is deleted.
|*
\/
@@ -708,8 +708,8 @@ void SdPage::Changed(const SdrObject rObj, SdrUserCallType
eType, const Rectang
}
else if (pModel)
{
-// MasterPage-Objekt wurde veraendert, daher
-// Objekte auf allen Seiten anpassen
+// Object of the master page changed, therefore adjust
+// object on all pages
sal_uInt16
[Libreoffice-commits] core.git: 6 commits - sd/source
sd/source/core/sdpage2.cxx| 68 -
sd/source/core/stlpool.cxx| 79 ++
sd/source/filter/eppt/eppt.cxx| 50 +-
sd/source/filter/eppt/eppt.hxx| 16 +++---
sd/source/filter/eppt/epptso.cxx | 43 +++-
sd/source/filter/eppt/escherex.cxx|2
sd/source/filter/eppt/pptx-epptbase.cxx |6 +-
sd/source/filter/eppt/pptx-stylesheet.cxx |4 -
sd/source/filter/eppt/pptx-text.cxx | 24 -
sd/source/filter/eppt/text.hxx| 12 ++--
10 files changed, 150 insertions(+), 154 deletions(-)
New commits:
commit 8eb64e21a826ddde37356d0cb22dbff408efd2c9
Author: Urs Fässler u...@bitzgi.ch
Date: Fri Mar 1 11:01:10 2013 +0100
translation of German comments in file sd/source/filter/eppt/pptx-text.cxx
Change-Id: Ibf2ef88a200699bea456b916fd5e59392d1f19e1
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index ff5532c..b344101 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -460,7 +460,7 @@ sal_uInt32 PortionObj::ImplCalculateTextPositions(
sal_uInt32 nCurrentTextPositi
}
// ---
-// Rueckgabe: 0 = kein TextField
+// Return: 0 = no TextField
// bit28-31 text field type :
// 1 = Date
// 2 = Time
@@ -501,7 +501,7 @@ sal_uInt32 PortionObj::ImplGetTextField(
::com::sun::star::uno::Reference ::com
{
sal_Bool bBool = sal_False;
aAny = bBool;
-if ( !bBool ) // Fixed DateFields gibt es
in PPT nicht
+if ( !bBool ) // Fixed DateFields does
not exist in PPT
{
if ( GetPropertyValue( aAny,
xFieldPropSet, rtl::OUString( Format ) ), sal_True )
{
@@ -893,17 +893,17 @@ void ParagraphObj::ImplGetNumberingLevel(
PPTExBulletProvider rBuProv, sal_Int1
if ( !aFontDesc.Name.isEmpty() )
{
-nParaFlags |= 0x90; // wir geben den Font und den
Charset vor
+nParaFlags |= 0x90; // we define the font and
charset
}
}
-case SVX_NUM_CHARS_UPPER_LETTER : // zaehlt von a-z,
aa - az, ba - bz, ...
+case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z,
aa - az, ba - bz, ...
case SVX_NUM_CHARS_LOWER_LETTER :
case SVX_NUM_ROMAN_UPPER :
case SVX_NUM_ROMAN_LOWER :
case SVX_NUM_ARABIC :
-case SVX_NUM_PAGEDESC : // Numerierung aus
der Seitenvorlage
+case SVX_NUM_PAGEDESC : // numbering from
the page template
case SVX_NUM_BITMAP :
-case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von
a-z, aa-zz, aaa-zzz
+case SVX_NUM_CHARS_UPPER_LETTER_N : // count from a-z,
aa-zz, aaa-zzz
case SVX_NUM_CHARS_LOWER_LETTER_N :
{
if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
@@ -1145,17 +1145,17 @@ void ParagraphObj::ImplConstruct( const ParagraphObj
rParagraphObj )
nBulletFlags = rParagraphObj.nBulletFlags;
sPrefix = rParagraphObj.sPrefix;
sSuffix = rParagraphObj.sSuffix;
-sGraphicUrl = rParagraphObj.sGraphicUrl;// String auf eine
Graphic
+sGraphicUrl = rParagraphObj.sGraphicUrl;// String to a graphic
aBuGraSize = rParagraphObj.aBuGraSize;
-nNumberingType = rParagraphObj.nNumberingType; // in wirlichkeit ist
dies ein SvxEnum
+nNumberingType = rParagraphObj.nNumberingType; // this is actually a
SvxEnum
nHorzAdjust = rParagraphObj.nHorzAdjust;
nBulletColor = rParagraphObj.nBulletColor;
nBulletOfs = rParagraphObj.nBulletOfs;
-nStartWith = rParagraphObj.nStartWith; // Start der
nummerierung
+nStartWith = rParagraphObj.nStartWith; // start of numbering
nTextOfs = rParagraphObj.nTextOfs;
-nBulletRealSize = rParagraphObj.nBulletRealSize;// GroessenVerhaeltnis
in Proz
-nDepth = rParagraphObj.nDepth; // aktuelle tiefe
-cBulletId = rParagraphObj.cBulletId;// wenn Numbering Type
== CharSpecial
+nBulletRealSize = rParagraphObj.nBulletRealSize;// scale in percent
+nDepth = rParagraphObj.nDepth; // actual
[PUSHED] Translation of german comments in sd/inc and sd/sdi
Hi Urs, On Fri, 2013-03-01 at 12:05 +0100, Urs Fässler wrote: Translation of german comments in sd/inc and sd/sdi Wow - this is some great work ! thanks so much for that :-) I'll send an individual [PUSHED] mail to each of yours for tracking [I'm up to commit 18]; but overall this looks great. A small number of these patches failed - where the work had been duplicated by someone else: patches 3-7 and 14 in the first 18 - which is a shame. Are you updating to the latest git before working ? [ that can be hard with conflicts of course ]. One quick/easy way to resolve that is: git pull -r git rebase --skip # until the rebase is complete Otherwise - this is great; one thing that would make the code cleaner and more readable is when you have things like; +++ b/sd/source/core/pglink.cxx @@ -54,7 +54,7 @@ SdPageLink::~SdPageLink() /* |* -|* Daten haben sich geaendert +|* Date have changed |* \/ If you could remove the big bulky ascii-art surround - that is of no real use to a developer and just wastes v-space - that would be a nice cleanup: but if you want to focus on just the content that's fine too. Also - another thing is if you find: /* This method makes spaghetti */ void makeSpaghetti() feel free to just kill it - it adds no value ;-) one last thing is - if we have a nice function description: /* Un-twist the general bottle-tops at high-speed backwards */ void untwistFast() It's great to turn it into a doxygen comment thus: /// Un-twist the general bottle-tops at high-speed backwards void untwistFast() So it will get sucked out into our web docs. Anyhow - thanks for the encouraging work, moving on to the next set now. [ Oh, and - if you can push more a handful of file at once as a commit that is prolly a good thing to do too to reduce mailing list and git commit churn ;-]. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: Translation of german comments of the files in sd/source/core
On Fri, 2013-03-01 at 12:08 +0100, Urs Fässler wrote: Translation of german comments of the files in sd/source/core Thanks - pushed ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: Translation of German comments of the files in sd/source/filter/eppt/
On Fri, 2013-03-01 at 12:10 +0100, Urs Fässler wrote: Translation of German comments of the files in sd/source/filter/eppt/ Thanks ! :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translation of German comments of the files in sd/source/filter/grf/
On Fri, 2013-03-01 at 12:12 +0100, Urs Fässler wrote: Translation of German comments of the files in sd/source/filter/grf/ Pushed; 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: [PATCH] Translation of German comments of the files in sd/source/filter/html/
On Fri, 2013-03-01 at 12:13 +0100, Urs Fässler wrote: Translation of German comments of the files in sd/source/filter/html/ Pushed; 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: [PATCH] Translation of German comments of the files in sd/source/filter/ppt/
On Fri, 2013-03-01 at 12:14 +0100, Urs Fässler wrote: Translation of German comments of the files in sd/source/filter/ppt/ Pushed; thanks :-) 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] core.git: 6 commits - cui/source editeng/CppunitTest_editeng_core.mk editeng/qa editeng/source Makefile.in solenv/bin sw/source vcl/unx
Makefile.in |2
cui/source/tabpages/page.src|4 -
editeng/CppunitTest_editeng_core.mk |1
editeng/qa/unit/core-test.cxx | 116
editeng/source/misc/svxacorr.cxx| 13 ++--
solenv/bin/callcatcher.Makefile | 12 ---
sw/source/filter/ww8/ww8graf.cxx|5 +
vcl/unx/generic/printer/cupsmgr.cxx |5 +
8 files changed, 137 insertions(+), 21 deletions(-)
New commits:
commit a526370737099b57b399f2ca8de43e74e24ab794
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 1 10:50:11 2013 +
Related: fdo#55693 add regression tests for autocorrection
Change-Id: Ie9bbeb38ec9cc2fa0377709e75abb0338b20bab5
diff --git a/editeng/CppunitTest_editeng_core.mk
b/editeng/CppunitTest_editeng_core.mk
index 6db6082..d8ede2e 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,editeng_core,\
configmgr/source/configmgr \
framework/util/fwk \
i18npool/util/i18npool \
+linguistic/source/lng \
sfx2/util/sfx \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index a43dcaa..dd4711c 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -38,6 +38,7 @@
#include editeng/eeitem.hxx
#include editeng/editids.hrc
#include editeng/editdoc.hxx
+#include editeng/svxacorr.hxx
#include editeng/unofield.hxx
#include com/sun/star/text/textfield/Type.hpp
@@ -61,9 +62,15 @@ public:
*/
void testUnoTextFields();
+/**
+ * AutoCorrect tests
+ */
+void testAutocorrect();
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testConstruction);
CPPUNIT_TEST(testUnoTextFields);
+CPPUNIT_TEST(testAutocorrect);
CPPUNIT_TEST_SUITE_END();
private:
@@ -221,6 +228,115 @@ void Test::testUnoTextFields()
}
}
+class TestAutoCorrDoc : public SvxAutoCorrDoc
+{
+public:
+TestAutoCorrDoc(const OUString rText, LanguageType eLang)
+: m_sText(rText)
+, m_eLang(eLang)
+{
+}
+OUString getResult() const
+{
+return m_sText.toString();
+}
+private:
+OUStringBuffer m_sText;
+LanguageType m_eLang;
+virtual sal_Bool Delete( xub_StrLen nStt, xub_StrLen nEnd )
+{
+//fprintf(stderr, TestAutoCorrDoc::Delete\n);
+m_sText.remove(nStt, nEnd-nStt);
+return true;
+}
+virtual sal_Bool Insert( xub_StrLen nPos, const String rTxt )
+{
+//fprintf(stderr, TestAutoCorrDoc::Insert\n);
+m_sText.insert(nPos, rTxt);
+return true;
+}
+virtual sal_Bool Replace( xub_StrLen nPos, const String rTxt )
+{
+//fprintf(stderr, TestAutoCorrDoc::Replace\n);
+return ReplaceRange( nPos, rTxt.Len(), rTxt );
+}
+virtual sal_Bool ReplaceRange( xub_StrLen nPos, xub_StrLen nLen, const
String rTxt )
+{
+//fprintf(stderr, TestAutoCorrDoc::ReplaceRange %d %d %s\n, nPos,
nLen, OUStringToOString(rTxt, RTL_TEXTENCODING_UTF8).getStr());
+m_sText.remove(nPos, nLen);
+m_sText.insert(nPos, rTxt);
+return true;
+}
+virtual sal_Bool SetAttr( xub_StrLen, xub_StrLen, sal_uInt16, SfxPoolItem
)
+{
+//fprintf(stderr, TestAutoCorrDoc::SetAttr\n);
+return true;
+}
+virtual sal_Bool SetINetAttr( xub_StrLen, xub_StrLen, const String )
+{
+//fprintf(stderr, TestAutoCorrDoc::SetINetAttr\n);
+return true;
+}
+virtual const String* GetPrevPara( sal_Bool )
+{
+//fprintf(stderr, TestAutoCorrDoc::GetPrevPara\n);
+return NULL;
+}
+virtual sal_Bool ChgAutoCorrWord( sal_uInt16 rSttPos,
+sal_uInt16 nEndPos, SvxAutoCorrect rACorrect,
+const String** ppPara )
+{
+//fprintf(stderr, TestAutoCorrDoc::ChgAutoCorrWord\n);
+
+if (m_sText.isEmpty())
+return false;
+
+const SvxAutocorrWord* pFnd =
rACorrect.SearchWordsInList(m_sText.toString(), rSttPos, nEndPos, *this,
m_eLang);
+if (pFnd pFnd-IsTextOnly())
+{
+m_sText.remove(rSttPos, nEndPos);
+m_sText.insert(rSttPos, pFnd-GetLong());
+if( ppPara )
+*ppPara = NULL;//pCurNode-GetString();
+return true;
+}
+
+return false;
+}
+};
+
+//https://bugs.freedesktop.org/show_bug.cgi?id=55693
+//Two capitalized letters are not corrected if dash or slash are directly
+//before the two letters
+void Test::testAutocorrect()
+{
+OUString sShareAutocorrFile;
+OUString sUserAutocorrFile;
+SvxAutoCorrect aAutoCorrect(sShareAutocorrFile, sUserAutocorrFile);
+
+{
+OUString sInput(TEst-TEst);
+sal_Unicode cNextChar(' ');
+OUString sExpected(Test-Test );
+
+TestAutoCorrDoc aFoo(sInput, LANGUAGE_ENGLISH_US);
Re: Tinderbox failure, Win-x86@7-MinGW, MASTER, last success: 2013-02-26 13:51:47
Hi Matus, Matúš Kukan matus.ku...@gmail.com napsal(a): What do we really need from setup_native for Windows/Mingw ? Does it make sense to fix these issues below or just avoid building them ? Could someone have a look and examine properly setup_native/Module_setup_native.mk ? Done, MinGW should be building again (at least it builds run for me). Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Notes 2 - Coming Our Way?
On Fri, 2013-03-01 at 11:33 +0100, Michael Stahl wrote: well it was mostly implemented by Max Odendahl and designed by Christoph Noack, both volunteers. Terribly sorry :-) apologies to the authors etc. t'was in the Sun days though ... ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: undefined reference error while build
Hi Matus, I tried ot out, but it too didn't help ! Do we have another approach? Thanks Regards Prashant On Fri, Mar 1, 2013 at 3:30 PM, Matúš Kukan matus.ku...@gmail.com wrote: On 1 March 2013 10:51, Prashant Pandey prashant3.yi...@gmail.com wrote: Hi Noel, ps aux show the following results: elixir 32147 0.0 0.0 13400 1748 pts/0S+ 14:49 0:00 bash -c cd /home/elixir/lo/postprocess unset MAKEFLAGS \??/home/elixir/lo/solen elixir 32148 0.0 0.2 40152 9684 pts/0S+ 14:49 0:00 perl -S /home/elixir/lo/solenv/bin/build.pl -P4 --all -- -P4 elixir 32154 0.0 0.2 40152 8136 pts/0S+ 14:49 0:00 perl -S /home/elixir/lo/solenv/bin/build.pl -P4 --all -- -P4 elixir 32155 1.3 7.6 304184 295196 pts/0 S+ 14:49 0:23 make -f Makefile -j4 -rs all slowcheck So you were building still with build.pl - it can happen - just kill the process, pull and run make again. There will be no more perl controlling the build. HTH, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/pack
odk/pack/gendocu/Doxyfile |1 + 1 file changed, 1 insertion(+) New commits: commit e06559e69ac9432a6ada4934c39721217c8c6f49 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 1 13:35:24 2013 +0100 use short names for doxygen-generated files This is a build fix for Windows, otherwise packaging ODK fails with complaints about lines in .ddf files being longer than 256 characters, caused by doxygen using very long names for complex types (such as the rtl stringutils.hxx helpers). It'd be possibly cleaner to avoid somehow generating docs for these internal types at all, but this should do. diff --git a/odk/pack/gendocu/Doxyfile b/odk/pack/gendocu/Doxyfile index 8974627..4e916e5 100644 --- a/odk/pack/gendocu/Doxyfile +++ b/odk/pack/gendocu/Doxyfile @@ -33,6 +33,7 @@ JAVADOC_AUTOBRIEF = YES EXTRACT_ALL = YES CASE_SENSE_NAMES = NO +SHORT_NAMES = YES QUIET = % WARNINGS = YES ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/drawattr.hxx|4 ++--
sc/source/ui/view/drawattr.cxx |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1cdb93954633a7a2a6346f7cd6637d57672b3c72
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Wed Feb 27 17:21:51 2013 -0300
String::CreateFromAscii drop in sc
Change-Id: Idb9fda589b309bd850ba2fdd68e7170c28d4c31a
Reviewed-on: https://gerrit.libreoffice.org/2448
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index 2878c3f..e3c3a75 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -33,10 +33,10 @@ public:
SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){}
-virtual String GetValueText() const;
+virtual OUStringGetValueText() const;
-virtual String GetValueText(sal_uInt16 nVal) const;
+virtual OUStringGetValueText(sal_uInt16 nVal) const;
virtual sal_uInt16 GetValueCount() const
{return((sal_uInt16)SVX_SNAP_DRAW_TEXT);}
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index 63fa606..cb58d2a 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -22,14 +22,14 @@
//
-String SvxDrawToolItem::GetValueText() const
+OUString SvxDrawToolItem::GetValueText() const
{
return GetValueText(GetValue());
}
//
-String SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
+OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
{
const sal_Char* p;
@@ -47,7 +47,7 @@ String SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
case 8 : p = SVX_SNAP_DRAW_TEXT ; break;
default : return EMPTY_STRING;
}
-return String::CreateFromAscii( p );
+return OUString::createFromAscii( p );
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/source vcl/source vcl/win xmloff/source
sw/source/filter/ww8/ww8scan.cxx |2 +-
vcl/source/gdi/outdev3.cxx |5 -
vcl/win/source/gdi/winlayout.cxx |9 +
xmloff/source/draw/sdxmlexp.cxx |4 +++-
4 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 4c8d4308d6e975c93d7d4bfb6f8a11d41c1f05a1
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 1 12:43:55 2013 +
WaE: init variables
Change-Id: Ia9d120348787bd566a3c9049f7adaf76648d096e
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 5ffed47..86cdd8c 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2935,7 +2935,9 @@ XMLFontAutoStylePool*
SdXMLExport::CreateFontAutoStylePool()
for( int i = 0; i nLen; i++ )
{
OUString sFamilyName, sStyleName;
-sal_Int16 eFamily, ePitch, eCharSet;
+sal_Int16 eFamily(FAMILY_DONTKNOW),
+ePitch(PITCH_DONTKNOW),
+eCharSet(RTL_TEXTENCODING_DONTKNOW);
aAnySeq[nSeqIndex++] = sFamilyName;
aAnySeq[nSeqIndex++] = sStyleName;
commit ee5d620011152e6f260a1712f02cb48da34734d6
Author: Herbert Dürr h...@apache.org
Date: Fri May 4 07:24:43 2012 +
(cherry picked from commit c4ce6e92db9e784eed2c0863d4c30bf9eddf3da1)
Conflicts:
vcl/win/source/gdi/winlayout.cxx
Change-Id: I564e3d2186578041a70f329810173b82c8f1ce5b
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index c5de8ea..da6d40e 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5972,7 +5972,10 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
String rStr,
|| ((*pStr = 0x1100) (*pStr 0x1200)) // hangul jamo
|| ((*pStr = 0x1700) (*pStr 0x1900)) // many CTL scripts
|| ((*pStr = 0xFB1D) (*pStr 0xFE00)) // middle east
presentation
-|| ((*pStr = 0xFE70) (*pStr 0xFEFF)) ) // arabic
presentation B
+|| ((*pStr = 0xFE70) (*pStr 0xFEFF)) // arabic
presentation B
+|| ((*pStr = 0xFE00) (*pStr 0xFE10)) // variation
selectors in BMP
+|| ((pStr + 1 pEnd) (pStr[0] == 0xDB40) (0xDD00 =
pStr[1]) (pStr[1] 0xDEF0)) // variation selector supplement
+)
break;
if( pStr = pEnd )
nLayoutFlags |= SAL_LAYOUT_COMPLEX_DISABLED;
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index abd5144..1404c2c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -69,8 +69,8 @@ using ::rtl::OUStringToOString;
class ImplWinFontEntry : public ImplFontEntry
{
public:
-ImplWinFontEntry( FontSelectPattern );
-~ImplWinFontEntry();
+explicitImplWinFontEntry( FontSelectPattern );
+virtual ~ImplWinFontEntry();
private:
// TODO: also add HFONT??? Watch out for issues with too many active
fonts...
@@ -1189,6 +1189,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs rArgs )
SCRIPT_CONTROL aScriptControl =
{nLangId,false,false,false,false,false,false,false,false,0};
aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
aScriptControl.fContextDigits = (0 != (rArgs.mnFlags
SAL_LAYOUT_SUBSTITUTE_DIGITS));
+aScriptControl.fMergeNeutralItems = true;
// determine relevant substring and work only on it
// when Bidi status is unknown we need to look at the whole string though
mnSubStringMin = 0;
@@ -1426,7 +1427,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs rArgs )
{
if( mpLogClusters[ c ] == i )
{
-// #i55716#
+// #i55716# skip WORDJOINER
if( rArgs.mpStr[ c ] == 0x2060 )
mpOutGlyphs[ i + rVisualItem.mnMinGlyphPos
] = 1;
else
@@ -1441,7 +1442,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs rArgs )
{
if( mpLogClusters[ c ] == i )
{
-// #i55716#
+// #i55716# skip WORDJOINER
if( rArgs.mpStr[ c ] == 0x2060 )
mpOutGlyphs[ i + rVisualItem.mnMinGlyphPos
] = 1;
else
commit 7f47f5bd09b8bb32de9fd38f941a621965c48045
Author: Herbert Dürr h...@apache.org
Date: Tue Jun 19 07:25:13 2012 +
#c704126# fix off-by-one when parsing WW8_STD's fHidden member
According to the header file ww8struc.hxx the fHidden member is at bit 1
(cherry picked from commit
[PUSHED] String::CreateFromAscii drop in sc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2448 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2448 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb9fda589b309bd850ba2fdd68e7170c28d4c31a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: undefined reference error while build
Hi Prashant, On Fri, 2013-03-01 at 15:21 +0530, Prashant Pandey wrote: ps aux show the following results: Wow that was a lot to paste in-line ;-) elixir 32113 0.0 0.0 12348 996 pts/0T14:48 0:00 pager elixir 32114 0.0 0.0 12000 2960 pts/0S+ 14:49 0:00 make elixir 32147 0.0 0.0 13400 1748 pts/0S+ 14:49 0:00 bash -c cd /home/elixir/lo/postprocess unset MAKEFLAGS \??/home/elixir/lo/solen elixir 32148 0.0 0.2 40152 9684 pts/0S+ 14:49 0:00 perl -S /home/elixir/lo/solenv/bin/build.pl -P4 --all -- -P4 elixir 32154 0.0 0.2 40152 8136 pts/0S+ 14:49 0:00 perl -S /home/elixir/lo/solenv/bin/build.pl -P4 --all -- -P4 elixir 32155 1.3 7.6 304184 295196 pts/0 S+ 14:49 0:23 make -f Makefile -j4 -rs all slowcheck elixir@ubuntu:~/lo$ It is stuck in some slowcheck I suppose; but not in a runaway java, it looks odd. If you kill it [ the slowcheck suggests it's really finished already and is just running tests ], and then do: make -f Makefile -j4 -rs all slowcheck To check it still hangs; and then do: strace -s 256 -f -ttt -o /tmp/slog make -f Makefile -j4 -rs all slowcheck bzip2 the /tmp/slog and mail -only-me- (ie. not the list it will be too big), the /tmp/slog.bz2 - then perhaps we can dig something out of that. I would imagine that a 'make dev-install' would produce something runable from where you are though. Thanks ! 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] core.git: libcdr/libcdr-0.0.11-encoding.patch libcdr/UnpackedTarball_cdr.mk
libcdr/UnpackedTarball_cdr.mk |6 ++
libcdr/libcdr-0.0.11-encoding.patch | 36
2 files changed, 42 insertions(+)
New commits:
commit 4b063c0e5b0e04986c98e7dd005a6223d8d9785a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 14:12:38 2013 +0100
CDR: Respect override of encoding information
Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..b69221e 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.1q-encoding.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.11-encoding.patch
b/libcdr/libcdr-0.0.11-encoding.patch
new file mode 100644
index 000..73fa58a
--- /dev/null
+++ b/libcdr/libcdr-0.0.11-encoding.patch
@@ -0,0 +1,36 @@
+--- a/src/lib/CDRParser.cpp
b/src/lib/CDRParser.cpp
+@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ unsigned numFonts = readU32(input);
+ CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
+-std::mapunsigned,unsigned fontIds;
++std::mapunsigned,unsigned short fontIds;
++std::mapunsigned,unsigned short fontEncodings;
+ std::mapunsigned,double fontSizes;
+ for (i=0; inumFonts; ++i)
+ {
+@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ input-seek(12, WPX_SEEK_CUR);
+ else
+ input-seek(20, WPX_SEEK_CUR);
+- fontIds[fontStyleId] = readU32(input);
++ fontIds[fontStyleId] = readU16(input);
++ fontEncodings[fontStyleId] = readU16(input);
+ input-seek(8, WPX_SEEK_CUR);
+ fontSizes[fontStyleId] = readCoordinate(input);
+ if (m_version 1000)
+@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ if (!fontRecordId)
+ continue;
+-std::mapunsigned, unsigned::const_iterator iterFontId =
fontIds.find(fontRecordId);
++std::mapunsigned, unsigned short::const_iterator iterFontId =
fontIds.find(fontRecordId);
+ if (iterFontId != fontIds.end())
+ tmpCharStyle.m_fontId = iterFontId-second;
++std::mapunsigned, unsigned short::const_iterator iterCharSet =
fontEncodings.find(fontRecordId);
++if (iterCharSet != fontEncodings.end())
++ tmpCharStyle.m_charSet = iterCharSet-second;
+ std::mapunsigned, double::const_iterator iterFontSize =
fontSizes.find(fontRecordId);
+ if (iterFontSize != fontSizes.end())
+ tmpCharStyle.m_fontSize = iterFontSize-second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] CDR: Respect override of encoding information
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2487
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/2487/1
CDR: Respect override of encoding information
Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
(cherry picked from commit 4b063c0e5b0e04986c98e7dd005a6223d8d9785a)
---
M libcdr/UnpackedTarball_cdr.mk
A libcdr/libcdr-0.0.11-encoding.patch
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..b69221e 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.1q-encoding.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.11-encoding.patch
b/libcdr/libcdr-0.0.11-encoding.patch
new file mode 100644
index 000..73fa58a
--- /dev/null
+++ b/libcdr/libcdr-0.0.11-encoding.patch
@@ -0,0 +1,36 @@
+--- a/src/lib/CDRParser.cpp
b/src/lib/CDRParser.cpp
+@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ unsigned numFonts = readU32(input);
+ CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
+-std::mapunsigned,unsigned fontIds;
++std::mapunsigned,unsigned short fontIds;
++std::mapunsigned,unsigned short fontEncodings;
+ std::mapunsigned,double fontSizes;
+ for (i=0; inumFonts; ++i)
+ {
+@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ input-seek(12, WPX_SEEK_CUR);
+ else
+ input-seek(20, WPX_SEEK_CUR);
+- fontIds[fontStyleId] = readU32(input);
++ fontIds[fontStyleId] = readU16(input);
++ fontEncodings[fontStyleId] = readU16(input);
+ input-seek(8, WPX_SEEK_CUR);
+ fontSizes[fontStyleId] = readCoordinate(input);
+ if (m_version 1000)
+@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ if (!fontRecordId)
+ continue;
+-std::mapunsigned, unsigned::const_iterator iterFontId =
fontIds.find(fontRecordId);
++std::mapunsigned, unsigned short::const_iterator iterFontId =
fontIds.find(fontRecordId);
+ if (iterFontId != fontIds.end())
+ tmpCharStyle.m_fontId = iterFontId-second;
++std::mapunsigned, unsigned short::const_iterator iterCharSet =
fontEncodings.find(fontRecordId);
++if (iterCharSet != fontEncodings.end())
++ tmpCharStyle.m_charSet = iterCharSet-second;
+ std::mapunsigned, double::const_iterator iterFontSize =
fontSizes.find(fontRecordId);
+ if (iterFontSize != fontSizes.end())
+ tmpCharStyle.m_fontSize = iterFontSize-second;
--
To view, visit https://gerrit.libreoffice.org/2487
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace rtl::O(U)String with O(U)String
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2475 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2475 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/gdi/sallayout.cxx |5 +
vcl/source/window/printdlg.cxx | 12 +++-
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 9c7cf46fbf01f62ea9520c4ba1ec4748fe62b20b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 1 13:28:21 2013 +
Resolves: fdo#61656 use order and orientation combobox select pos as index
not the associated entry data, which isn't set for these simple
1 to 1 position - data comboboxes
Change-Id: I0c73786bca00684cedc4672d0ad5e61d0c1f9bd7
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index eb8..e226f78 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -449,11 +449,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup(
const vcl::PrinterControll
mpBorderCB-Check( i_rMPS.bDrawBorder );
mpNupRowsEdt-SetValue( i_rMPS.nRows );
mpNupColEdt-SetValue( i_rMPS.nColumns );
-for( sal_uInt16 i = 0; i mpNupOrderBox-GetEntryCount(); i++ )
-{
-if( int(sal_IntPtr(mpNupOrderBox-GetEntryData( i ))) == i_rMPS.nOrder
)
-mpNupOrderBox-SelectEntryPos( i );
-}
+mpNupOrderBox-SelectEntryPos( i_rMPS.nOrder );
if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 )
{
mpNupPagesBox-SelectEntryPos( mpNupPagesBox-GetEntryCount()-1 );
@@ -1438,8 +1434,7 @@ void PrintDialog::updateNup()
aMPS.bDrawBorder= maNUpPage.mpBorderCB-IsChecked();
-int nOrderMode = int(sal_IntPtr(maNUpPage.mpNupOrderBox-GetEntryData(
- maNUpPage.mpNupOrderBox-GetSelectEntryPos() )));
+int nOrderMode = maNUpPage.mpNupOrderBox-GetSelectEntryPos();
if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTB )
aMPS.nOrder = PrinterController::LRTB;
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBLR )
@@ -1449,8 +1444,7 @@ void PrintDialog::updateNup()
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBRL )
aMPS.nOrder = PrinterController::TBRL;
-int nOrientationMode =
int(sal_IntPtr(maNUpPage.mpNupOrientationBox-GetEntryData(
-
maNUpPage.mpNupOrientationBox-GetSelectEntryPos() )));
+int nOrientationMode = maNUpPage.mpNupOrientationBox-GetSelectEntryPos();
if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
aMPS.aPaperSize = maNupLandscapeSize;
else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT )
commit 6840ba613cc46ee65d58612ecabe748d539de9f5
Author: Herbert Dürr h...@apache.org
Date: Fri May 4 08:01:31 2012 +
#i103131# in doubt treat unicode variation selectors as invisible(cherry
picked from commit 179f88dfe5a1eb2ebd051d73b50f1e0af9c12fd9)
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 7171f59..695256c 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -253,6 +253,11 @@ inline bool IsControlChar( sal_UCS4 cChar )
// byte order markers and invalid unicode
if( (cChar == 0xFEFF) || (cChar == 0xFFFE) || (cChar == 0x) )
return true;
+// variation selectors
+if( (0xFE00 = cChar) (cChar = 0xFE0F) )
+return true;
+if( (0xE0100 = cChar) (cChar = 0xE01EF) )
+return true;
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk
download.lst |4 ++--
libcdr/UnpackedTarball_cdr.mk |6 --
libcdr/libcdr-0.0.10-ellipse.patch | 19 ---
3 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit ada8b3fb0e84013c9793a0213a7637678dd79b55
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 10:38:31 2013 +0100
Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
(cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
Reviewed-on: https://gerrit.libreoffice.org/2485
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/download.lst b/download.lst
index 75d928c..0420af9 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
-export CDR_TARBALL := libcdr-0.0.10.tar.bz2
+CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
+export CDR_TARBALL := libcdr-0.0.11.tar.bz2
MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 541fa96..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
- libcdr/libcdr-0.0.10-ellipse.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch
b/libcdr/libcdr-0.0.10-ellipse.patch
deleted file mode 100644
index 0b392a7..000
--- a/libcdr/libcdr-0.0.10-ellipse.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream
*input)
- double rx = fabs(cx);
- double ry = fabs(cy);
-
-+ while (angle1 0.0)
-+angle1 += 2*M_PI;
-+ while (angle1 2*M_PI)
-+angle1 -= 2*M_PI;
-+
-+ while (angle2 0.0)
-+angle2 += 2*M_PI;
-+ while (angle2 2*M_PI)
-+angle2 -= 2*M_PI;
-+
- if (angle1 != angle2)
- {
- if (angle2 angle1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libcdr/UnpackedTarball_cdr.mk
libcdr/UnpackedTarball_cdr.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f351d1a3fd0d14e37f71fe7f565a5579f654df7d Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 1 13:36:32 2013 + typo: 1q - 11 Change-Id: I13c1665b0d4b266256d225c1f7b213d18f7ca0ba diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index b69221e..1c77ebd 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) $(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.1q-encoding.patch \ + libcdr/libcdr-0.0.11-encoding.patch \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Hints for Bug 61495 - Indentation difference for Backspace and Shift+Enter after conversion to .doc/.docx
Hi *, I have found a Bug in LibreOffice Writer https://bugs.freedesktop.org/show_bug.cgi?id=61495 and I would like to hack on this. I need a hint, where is code for export filter to docx or doc? Best Regards, Maciek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2485 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2485 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/libcdr-0.0.11-encoding.patch libcdr/UnpackedTarball_cdr.mk
libcdr/UnpackedTarball_cdr.mk |6 ++
libcdr/libcdr-0.0.11-encoding.patch | 36
2 files changed, 42 insertions(+)
New commits:
commit 5ee9f83de2caf5cbf92b233c21f1a65bf001d93d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 14:12:38 2013 +0100
CDR: Respect override of encoding information
Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
(cherry picked from commit 4b063c0e5b0e04986c98e7dd005a6223d8d9785a)
Reviewed-on: https://gerrit.libreoffice.org/2487
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..1c77ebd 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.11-encoding.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.11-encoding.patch
b/libcdr/libcdr-0.0.11-encoding.patch
new file mode 100644
index 000..73fa58a
--- /dev/null
+++ b/libcdr/libcdr-0.0.11-encoding.patch
@@ -0,0 +1,36 @@
+--- a/src/lib/CDRParser.cpp
b/src/lib/CDRParser.cpp
+@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ unsigned numFonts = readU32(input);
+ CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
+-std::mapunsigned,unsigned fontIds;
++std::mapunsigned,unsigned short fontIds;
++std::mapunsigned,unsigned short fontEncodings;
+ std::mapunsigned,double fontSizes;
+ for (i=0; inumFonts; ++i)
+ {
+@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ input-seek(12, WPX_SEEK_CUR);
+ else
+ input-seek(20, WPX_SEEK_CUR);
+- fontIds[fontStyleId] = readU32(input);
++ fontIds[fontStyleId] = readU16(input);
++ fontEncodings[fontStyleId] = readU16(input);
+ input-seek(8, WPX_SEEK_CUR);
+ fontSizes[fontStyleId] = readCoordinate(input);
+ if (m_version 1000)
+@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
+ }
+ if (!fontRecordId)
+ continue;
+-std::mapunsigned, unsigned::const_iterator iterFontId =
fontIds.find(fontRecordId);
++std::mapunsigned, unsigned short::const_iterator iterFontId =
fontIds.find(fontRecordId);
+ if (iterFontId != fontIds.end())
+ tmpCharStyle.m_fontId = iterFontId-second;
++std::mapunsigned, unsigned short::const_iterator iterCharSet =
fontEncodings.find(fontRecordId);
++if (iterCharSet != fontEncodings.end())
++ tmpCharStyle.m_charSet = iterCharSet-second;
+ std::mapunsigned, double::const_iterator iterFontSize =
fontSizes.find(fontRecordId);
+ if (iterFontSize != fontSizes.end())
+ tmpCharStyle.m_fontSize = iterFontSize-second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] CDR: Respect override of encoding information
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2487 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2487 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 948448657e9565eb0afa146cfa8769f89d44d44b Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 Updated core Project: dictionaries 7e4239060266bf238b5e6692ed10d548c37572d5 diff --git a/dictionaries b/dictionaries index 22c5f0b..7e42390 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 22c5f0b69b2e2954bddbb0ce0dcfe5721b440bd1 +Subproject commit 7e4239060266bf238b5e6692ed10d548c37572d5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: en/en_AU.dic en/en_GB.aff en/en_GB.dic en/en_ZA.aff en/en_ZA.dic
en/en_AU.dic |7 --- en/en_GB.aff |3 ++- en/en_GB.dic |5 +++-- en/en_ZA.aff |1 + en/en_ZA.dic | 15 --- 5 files changed, 18 insertions(+), 13 deletions(-) New commits: commit 7e4239060266bf238b5e6692ed10d548c37572d5 Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 diff --git a/en/en_AU.dic b/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/en/en_AU.dic +++ b/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trammel/DSG trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullheadedness' bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/en/en_GB.aff b/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/en/en_GB.aff +++ b/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 205,203 # 709 AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/en/en_GB.dic b/en/en_GB.dic index 7e50035..a482557 100644 --- a/en/en_GB.dic +++ b/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillization tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestism/2 1 transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/en/en_ZA.aff b/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/en/en_ZA.aff +++ b/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXà çèîêà ïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/en/en_ZA.dic b/en/en_ZA.dic index af95275..49fc246 100644 --- a/en/en_ZA.dic +++ b/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-a-hoop cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrate/DhnSkGN frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumber/dS cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ trait/E traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullheadedness/S bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ nicotine/MS niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'ref/for/libreoffice-4-0'
New branch 'ref/for/libreoffice-4-0' available with the following commits: commit f39d59526888e9cbf5afccdf8626db9d7d34a4d1 Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'ref/for/libreoffice-3-6'
New branch 'ref/for/libreoffice-3-6' available with the following commits: commit 0fffa9f214a3b6642eec74a69e06e173740a2ae1 Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-3-6] fdo#61660 unhelpful dictionary entries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2488 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/88/2488/1 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 --- M dictionaries/en/en_AU.dic M dictionaries/en/en_GB.aff M dictionaries/en/en_GB.dic M dictionaries/en/en_ZA.aff M dictionaries/en/en_ZA.dic 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dictionaries/en/en_AU.dic b/dictionaries/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/dictionaries/en/en_AU.dic +++ b/dictionaries/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/dictionaries/en/en_GB.aff b/dictionaries/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/dictionaries/en/en_GB.aff +++ b/dictionaries/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/dictionaries/en/en_GB.dic b/dictionaries/en/en_GB.dic index 7e50035..a482557 100644 --- a/dictionaries/en/en_GB.dic +++ b/dictionaries/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/dictionaries/en/en_ZA.aff b/dictionaries/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/dictionaries/en/en_ZA.aff +++ b/dictionaries/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/dictionaries/en/en_ZA.dic b/dictionaries/en/en_ZA.dic index af95275..49fc246 100644 --- a/dictionaries/en/en_ZA.dic +++ b/dictionaries/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M -- To view, visit https://gerrit.libreoffice.org/2488 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Branch 'ref/for/libreoffice-3-6' - 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
[Libreoffice-commits] dictionaries.git: Branch 'ref/for/libreoffice-4-0' - 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
[PATCH libreoffice-4-0] fdo#61660 unhelpful dictionary entries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2489 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/89/2489/1 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 --- M en/en_AU.dic M en/en_GB.aff M en/en_GB.dic M en/en_ZA.aff M en/en_ZA.dic 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/en/en_AU.dic b/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/en/en_AU.dic +++ b/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/en/en_GB.aff b/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/en/en_GB.aff +++ b/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/en/en_GB.dic b/en/en_GB.dic index 7e50035..a482557 100644 --- a/en/en_GB.dic +++ b/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/en/en_ZA.aff b/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/en/en_ZA.aff +++ b/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/en/en_ZA.dic b/en/en_ZA.dic index af95275..49fc246 100644 --- a/en/en_ZA.dic +++ b/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M -- To view, visit https://gerrit.libreoffice.org/2489 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Resolves: fdo#61656 use order and orientation combobox selec...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2490
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/2490/1
Resolves: fdo#61656 use order and orientation combobox select pos as index
not the associated entry data, which isn't set for these simple
1 to 1 position - data comboboxes
Change-Id: I0c73786bca00684cedc4672d0ad5e61d0c1f9bd7
(cherry picked from commit 9c7cf46fbf01f62ea9520c4ba1ec4748fe62b20b)
---
M vcl/source/window/printdlg.cxx
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 0e63800..0e88fa2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -449,11 +449,7 @@
mpBorderCB-Check( i_rMPS.bDrawBorder );
mpNupRowsEdt-SetValue( i_rMPS.nRows );
mpNupColEdt-SetValue( i_rMPS.nColumns );
-for( sal_uInt16 i = 0; i mpNupOrderBox-GetEntryCount(); i++ )
-{
-if( int(sal_IntPtr(mpNupOrderBox-GetEntryData( i ))) == i_rMPS.nOrder
)
-mpNupOrderBox-SelectEntryPos( i );
-}
+mpNupOrderBox-SelectEntryPos( i_rMPS.nOrder );
if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 )
{
mpNupPagesBox-SelectEntryPos( mpNupPagesBox-GetEntryCount()-1 );
@@ -1444,8 +1440,7 @@
aMPS.bDrawBorder= maNUpPage.mpBorderCB-IsChecked();
-int nOrderMode = int(sal_IntPtr(maNUpPage.mpNupOrderBox-GetEntryData(
- maNUpPage.mpNupOrderBox-GetSelectEntryPos() )));
+int nOrderMode = maNUpPage.mpNupOrderBox-GetSelectEntryPos();
if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTB )
aMPS.nOrder = PrinterController::LRTB;
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBLR )
@@ -1455,8 +1450,7 @@
else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBRL )
aMPS.nOrder = PrinterController::TBRL;
-int nOrientationMode =
int(sal_IntPtr(maNUpPage.mpNupOrientationBox-GetEntryData(
-
maNUpPage.mpNupOrientationBox-GetSelectEntryPos() )));
+int nOrientationMode = maNUpPage.mpNupOrientationBox-GetSelectEntryPos();
if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
aMPS.aPaperSize = maNupLandscapeSize;
else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT )
--
To view, visit https://gerrit.libreoffice.org/2490
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c73786bca00684cedc4672d0ad5e61d0c1f9bd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove minor.mk
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2491
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/2491/1
remove minor.mk
Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.
Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
---
M Makefile.in
M config_host.mk.in
M configure.ac
M crashrep/WinResTarget_crashrep.mk
M desktop/WinResTarget_sbase.mk
M desktop/WinResTarget_scalc.mk
M desktop/WinResTarget_sdraw.mk
M desktop/WinResTarget_simpress.mk
M desktop/WinResTarget_smath.mk
M desktop/WinResTarget_soffice.mk
M desktop/WinResTarget_sofficebin.mk
M desktop/WinResTarget_sweb.mk
M desktop/WinResTarget_swriter.mk
M instsetoo_native/CustomTarget_install.mk
M solenv/CustomTarget_versionlist.mk
M solenv/Module_solenv.mk
D solenv/Package_minor.mk
M solenv/bin/ooinstall
M solenv/gbuild/gbuild.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
D solenv/inc/.gitignore
D solenv/inc/minor.mk.in
M vcl/Library_vclplug_gtk.mk
M vcl/Library_vclplug_gtk3.mk
M vcl/unx/gtk/a11y/atkutil.cxx
26 files changed, 26 insertions(+), 104 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 13a635f..208f619 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,6 @@
$(BUILDDIR)/config_host.mk : \
$(SRCDIR)/config_host.mk.in \
$(SRCDIR)/Makefile.in \
- $(SRCDIR)/solenv/inc/minor.mk.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
$(BUILDDIR)/autogen.lastrun
@@ -129,8 +128,7 @@
$(BUILDDIR)/config_host/*.mk \
$(BUILDDIR)/configure \
$(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-$(BUILDDIR)/lo.xcent \
-$(BUILDDIR)/solenv/inc/minor.mk
+$(BUILDDIR)/lo.xcent
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
diff --git a/config_host.mk.in b/config_host.mk.in
index 828bcd6..8dd533a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -298,6 +298,7 @@
export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBMYSQL=@LIBMYSQL@
export LIBMYSQL_PATH=@LIBMYSQL_PATH@
+export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
diff --git a/configure.ac b/configure.ac
index de10a0e..7d15301 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4053,7 +4053,6 @@
bin/get_config_variables \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
-solenv/inc/minor.mk.in \
instsetoo_native/util/openoffice.lst.in) \
| (cd CONF-FOR-BUILD tar xf -)
cp configure CONF-FOR-BUILD
@@ -11828,17 +11827,6 @@
fi
AC_CONFIG_FILES([config_host.mk Makefile lo.xcent
instsetoo_native/util/openoffice.lst])
-# Unlike AC_CONFIG_HEADERS, AC_CONFIG_FILES updates the target file even if
the contents
-# would be unchanged, avoid that.
-AC_CONFIG_FILES([solenv/inc/minor.mk.tmp:solenv/inc/minor.mk.in],
-[
-AC_MSG_NOTICE([creating solenv/inc/minor.mk])
-if diff solenv/inc/minor.mk.tmp solenv/inc/minor.mk /dev/null 21 ; then
-AC_MSG_NOTICE([solenv/inc/minor.mk is unchanged])
-else
-cp -f solenv/inc/minor.mk.tmp solenv/inc/minor.mk
-fi
-])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
diff --git a/crashrep/WinResTarget_crashrep.mk
b/crashrep/WinResTarget_crashrep.mk
index 6036157..c4c44ad 100644
--- a/crashrep/WinResTarget_crashrep.mk
+++ b/crashrep/WinResTarget_crashrep.mk
@@ -16,7 +16,7 @@
$(eval $(call gb_WinResTarget_add_defs,crashrep,\
-DRES_APP_NAME=crashrep \
-DRES_APP_FILEDESC=$(PRODUCTNAME) Crashreporter \
--DVERVARIANT=$(BUILD) \
+-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR=$(OOO_VENDOR) \
))
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index f4f49d4..bdf7531 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -36,7 +36,7 @@
-DRES_APP_NAME=sbase \
-DRES_APP_FILEDESC=$(PRODUCTNAME) Base \
-DRES_APP_ICON=icons/base_app.ico \
--DVERVARIANT=$(BUILD) \
+-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR=$(OOO_VENDOR) \
))
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 8781d0d..56e56f1 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -36,7 +36,7 @@
-DRES_APP_NAME=scalc \
-DRES_APP_FILEDESC=$(PRODUCTNAME) Calc \
-DRES_APP_ICON=icons/calc_app.ico \
--DVERVARIANT=$(BUILD) \
+-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR=$(OOO_VENDOR) \
))
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 09a8bf2..dcd9091 100644
--- a/desktop/WinResTarget_sdraw.mk
+++
[ABANDONED] gbuild: do not use gb_WinResTarget_get_dep_target
Matúš Kukan has abandoned this change. Change subject: gbuild: do not use gb_WinResTarget_get_dep_target .. Patch Set 1: Abandoned Does not make much sense -- To view, visit https://gerrit.libreoffice.org/2472 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7a198bff62c50a74f05ac6e1508f43a14610fd0d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-0' - en/en_AU.dic en/en_GB.aff en/en_GB.dic en/en_ZA.aff en/en_ZA.dic
en/en_AU.dic |7 --- en/en_GB.aff |3 ++- en/en_GB.dic |5 +++-- en/en_ZA.aff |1 + en/en_ZA.dic | 15 --- 5 files changed, 18 insertions(+), 13 deletions(-) New commits: commit a0bea3c39ca68fc2b57433b656f284e83312e22d Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Reviewed-on: https://gerrit.libreoffice.org/2489 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/en/en_AU.dic b/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/en/en_AU.dic +++ b/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trammel/DSG trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullheadedness' bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/en/en_GB.aff b/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/en/en_GB.aff +++ b/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 205,203 # 709 AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/en/en_GB.dic b/en/en_GB.dic index 7e50035..a482557 100644 --- a/en/en_GB.dic +++ b/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillization tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestism/2 1 transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/en/en_ZA.aff b/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/en/en_ZA.aff +++ b/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXà çèîêà ïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/en/en_ZA.dic b/en/en_ZA.dic index af95275..49fc246 100644 --- a/en/en_ZA.dic +++ b/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-a-hoop cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrate/DhnSkGN frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumber/dS cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ trait/E traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullheadedness/S bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ nicotine/MS niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 245c6c96a640053802ab53555fc65813defd2d7b Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 Updated core Project: dictionaries a0bea3c39ca68fc2b57433b656f284e83312e22d fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Reviewed-on: https://gerrit.libreoffice.org/2489 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/dictionaries b/dictionaries index 05601c2..a0bea3c 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 05601c2395351070ebb4c690a207faa97bcb6ed7 +Subproject commit a0bea3c39ca68fc2b57433b656f284e83312e22d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-3-6' - dictionaries/en
dictionaries/en/en_AU.dic |7 --- dictionaries/en/en_GB.aff |3 ++- dictionaries/en/en_GB.dic |5 +++-- dictionaries/en/en_ZA.aff |1 + dictionaries/en/en_ZA.dic | 15 --- 5 files changed, 18 insertions(+), 13 deletions(-) New commits: commit 33a68182c946334fde90e867f2b5315df9dd7d53 Author: Andras Timar ati...@suse.com Date: Fri Mar 1 14:58:56 2013 +0100 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Reviewed-on: https://gerrit.libreoffice.org/2488 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/dictionaries/en/en_AU.dic b/dictionaries/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/dictionaries/en/en_AU.dic +++ b/dictionaries/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trammel/DSG trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullheadedness' bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/dictionaries/en/en_GB.aff b/dictionaries/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/dictionaries/en/en_GB.aff +++ b/dictionaries/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 205,203 # 709 AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/dictionaries/en/en_GB.dic b/dictionaries/en/en_GB.dic index 7e50035..a482557 100644 --- a/dictionaries/en/en_GB.dic +++ b/dictionaries/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillization tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestism/2 1 transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/dictionaries/en/en_ZA.aff b/dictionaries/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/dictionaries/en/en_ZA.aff +++ b/dictionaries/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXà çèîêà ïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/dictionaries/en/en_ZA.dic b/dictionaries/en/en_ZA.dic index af95275..49fc246 100644 --- a/dictionaries/en/en_ZA.dic +++ b/dictionaries/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-a-hoop cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrate/DhnSkGN frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumber/dS cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ trait/E traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullheadedness/S bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ nicotine/MS niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#61660 unhelpful dictionary entries
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2489 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2489 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 2 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#61660 unhelpful dictionary entries
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2488 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2488 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 2 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Replace rtl::O(U)String with O(U)String
On Friday 01 of March 2013, Christina Rossmanith wrote: Hi, Lubos Lunak has prepared a huge automatically generated patch removing all those ::rtl prefixes. So it is a little waste of time to prepare such patches manually. Instead maybe you could help removing RTL_CONSTASCII_(U)STRINGPARAM if you are looking for an easy entry level task? Lubos, please correct me if I'm wrong. No, this is correct, intentionally going after this change is a waste of time. Do we have it written down somewhere that this is wanted? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Grammar checker] Undocumented change in the API for LO 4
On Thursday 28 of February 2013, Olivier R. wrote: Stephan Bergmann-2 wrote How exactly do you launch LO? If by calling install/program/soffice.bin instead of install/program/soffice then the behavior is expected (soffice starts and controls soffice.bin, which needs to re-start on first start after any upgrade to cater for potential changes in bundled extensions etc.). I followed the instructions here: https://wiki.documentfoundation.org/QA/HowToBibisect I have edited the page to not recommend running the binary without the wrapper. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Translated comments from german to english
On Friday 22 of February 2013, Stefan Schick wrote: Hey, there are more translation patches to come in the next days... All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Pushed, thanks for the patch. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 5bcf082f8b15d5af258b4c16dca7177b6762f2b8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 1 14:05:37 2013 +0100
Override encodings in stlt
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 99526c0..08dcccf 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
}
unsigned numFonts = readU32(input);
CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
-std::mapunsigned,unsigned fontIds;
+std::mapunsigned,unsigned short fontIds;
+std::mapunsigned,unsigned short fontEncodings;
std::mapunsigned,double fontSizes;
for (i=0; inumFonts; ++i)
{
@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
input-seek(12, WPX_SEEK_CUR);
else
input-seek(20, WPX_SEEK_CUR);
- fontIds[fontStyleId] = readU32(input);
+ fontIds[fontStyleId] = readU16(input);
+ fontEncodings[fontStyleId] = readU16(input);
input-seek(8, WPX_SEEK_CUR);
fontSizes[fontStyleId] = readCoordinate(input);
if (m_version 1000)
@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input,
unsigned length)
}
if (!fontRecordId)
continue;
-std::mapunsigned, unsigned::const_iterator iterFontId =
fontIds.find(fontRecordId);
+std::mapunsigned, unsigned short::const_iterator iterFontId =
fontIds.find(fontRecordId);
if (iterFontId != fontIds.end())
tmpCharStyle.m_fontId = iterFontId-second;
+std::mapunsigned, unsigned short::const_iterator iterCharSet =
fontEncodings.find(fontRecordId);
+if (iterCharSet != fontEncodings.end())
+ tmpCharStyle.m_charSet = iterCharSet-second;
std::mapunsigned, double::const_iterator iterFontSize =
fontSizes.find(fontRecordId);
if (iterFontSize != fontSizes.end())
tmpCharStyle.m_fontSize = iterFontSize-second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2486 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2486 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ef372b07f2bacc2b9034e3d61b9cc8a3677 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] unnecessary createFromAscii in svx
Caolán McNamara has abandoned this change. Change subject: unnecessary createFromAscii in svx .. Patch Set 2: Abandoned sure -- To view, visit https://gerrit.libreoffice.org/2446 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If13c0f526b7b95fff71e273834997b0bfc658235 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 4.0.1 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of our upcoming LibreOffice 4.0.1. This will be the first in a series of frequent updates to our feature-packed 4.0 branch. Please be aware that LibreOffice 4.0.1 RC2 is not ready for production use, you should continue to use LibreOffice 4.0.0 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ With this release candidate, the Android Impress Remote should work on all platforms - if you would like to test, an updated Android package is available here: http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-1.0.4/playstore/ImpressRemote.apk (and note https://wiki.documentfoundation.org/Development/Impress/RemoteHowTo) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.0.1 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.0.1/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/util solenv/bin
instsetoo_native/CustomTarget_install.mk |2 +-
instsetoo_native/util/openoffice.lst.in | 18 +-
solenv/bin/modules/installer/download.pm |2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 16826147188bd78d67b97863226f903cc24add71
Author: Petr Mladek pmla...@suse.cz
Date: Fri Mar 1 16:45:35 2013 +0100
rename LOdev builds to LibreOfficeDev
It is similar change that we did for the release builds.
Also fixes make-dev install on Windows.
Change-Id: I7d9a4bc2e7b14e79516acdfb90c709dbde1378ab
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 288bbbd..1383e31 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -102,7 +102,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
ifeq (TRUE,$(LIBO_DEV_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
- unzip -q -d $(DEVINSTALLDIR)
$(instsetoo_OUT)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
+ unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
else # LIBO_DEV_INSTALL
$(call
instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 0f7907d..48298d8 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -93,7 +93,7 @@ LibreOffice_Dev
{
variables
{
-PRODUCTNAME LOdev
+PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
@@ -137,9 +137,9 @@ LibreOffice_Dev
active 1
compression 5
script setup_osl
-downloadnameLibO-dev_{productversion}_{os}_install_{languages}
-langpackdownloadname
LibO-dev_{productversion}_languagepack_{os}_install_{languages}
-helppackdownloadname
LibO-dev_{productversion}_helppack_{os}_install_{languages}
+downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
+langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
+helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -187,10 +187,10 @@ LibreOffice_Dev_SDK
{
Settings
{
-downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
+downloadname
LibreOfficeDev-SDK_{packageversion}_{os}_install_{languages}
variables
{
-PRODUCTNAME LOdev
+PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
@@ -232,7 +232,7 @@ LibreOffice_Test
{
Settings
{
-downloadname LO-Test_{packageversion}_{os}_install_{languages}
+downloadname LibreOffice-Test_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibreOffice
@@ -271,10 +271,10 @@ LibreOffice_Dev_Test
{
Settings
{
-downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
+downloadname
LibreOfficeDev-Test_{packageversion}_{os}_install_{languages}
variables
{
-PRODUCTNAME LOdev
+PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 56606e8..18d2768 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -325,7 +325,7 @@ sub get_downloadname_productname
if ( $allvariables-{'PRODUCTNAME'} eq
[Libreoffice-commits] core.git: 2 commits - neon/configs sal/inc ucb/source
neon/configs/config.h| 149 +++
sal/inc/sal/log-areas.dox|1
ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx |6
ucb/source/ucp/webdav-neon/NeonSession.cxx |6
4 files changed, 130 insertions(+), 32 deletions(-)
New commits:
commit 260afe56fd6b2f34de8290f3cdb7d1df5b88f8a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 1 16:13:26 2013 +0100
neon commands cannot be aborted
See http://lists.manyfish.co.uk/pipermail/neon/2013-February/001533.html
Re:
About ne_set_read_timeout for why ne_close_connection is not a solution
here
(and currently would not work anyway, for the thread calling abort would
block
on the aGlobalNeonMutex introduced with
510da29131e56ba0e1783e505e7131e6f7e0d6b4
forced to make certain neon api calls thread-safe due to cups until the
blocking thread was done with its neon call) and a new, dedicated,
thread-safe
ne_session_* API call will be needed to allow aborting of a running
request.
So enable DAVResourceAccess::abort again and instead disable the underlying
NeonSession::abort. i#106766 Crash when cancelling extension update does
not
give any good rationale why DAVResourceAccess::abort had to be disabled, so
it
might well have been because the underlying NeonSession::abort was bogus to
begin with.
Change-Id: If8293b93a960907726208bb2f93c375d83357ed3
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 384f211..dfe78cb 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -198,6 +198,7 @@ certain functionality.
@li @c cmisucp
@li @c ucb.ucp
+@li @c ucb.ucp.webdav
@section unotools
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index 96fdd68..61f4969 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -553,10 +553,8 @@ void DAVResourceAccess::GET(
void DAVResourceAccess::abort()
throw( DAVException )
{
-// 17.11.09 (tkr): abort currently disabled caused by issue i106766
-// initialize();
-// m_xSession-abort();
-OSL_TRACE( Not implemented. - #i106766# );
+initialize();
+m_xSession-abort();
}
//=
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 5dbbefd..2ff06ae 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1657,11 +1657,7 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
void NeonSession::abort()
throw ( DAVException )
{
-if ( m_pHttpSession )
-{
-osl::Guard osl::Mutex theGlobalGuard( aGlobalNeonMutex );
-ne_close_connection( m_pHttpSession );
-}
+SAL_INFO(ucb.ucp.webdav, neon commands cannot be aborted);
}
// ---
commit 331dd1e80616030f824a91a2358857485a798e29
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 1 15:38:25 2013 +0100
Bring the hard-coded neon config.h in sync with neon 0.29.5 config.h.in
...keeping all the defines that had not yet been coverd as undefined for
now.
(HAVE_SOCKS_H curiously has disappeared from neon 0.29.5 config.h.in even
though
src/ne_socket.c still references it, but we had it undefined anyway.)
In general, this hard-coded config.h is a bad idea, though, of course.
Change-Id: I5337f1849b776b62676cee7794917742bcf35356
diff --git a/neon/configs/config.h b/neon/configs/config.h
index 6f715e3..85de093 100644
--- a/neon/configs/config.h
+++ b/neon/configs/config.h
@@ -1,3 +1,8 @@
+/* Contents kept in sync with config.h.in from neon 0.29.5 */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
/* Define to specific EGD socket path */
/* #undef EGD_PATH */
@@ -13,7 +18,10 @@
#endif
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
+
+/* Define to 1 if you have the `CRYPTO_set_idptr_callback' function. */
+/* #undef HAVE_CRYPTO_SET_IDPTR_CALLBACK */
/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
don't. */
@@ -44,18 +52,45 @@
/* Define if you have expat */
/* #undef HAVE_EXPAT */
+/* Define to 1 if you have the `fcntl' function. */
+/* #undef HAVE_FCNTL */
+
+/* Define to 1 if you have the fcntl.h header file. */
+/* #undef HAVE_FCNTL_H */
+
/* Define to 1 if you have the `fstat64' function. */
#define HAVE_FSTAT64
/* Define to 1 if you have the `gai_strerror' function. */
#define HAVE_GAI_STRERROR 1
+/* Define to 1 if you have the `gethostname' function. */
+/* #undef HAVE_GETHOSTNAME */
+
+/* Define to 1 if
[Libreoffice-commits] core.git: 2 commits - svtools/source ucb/source
svtools/source/control/inettbc.cxx | 117 --
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 142 ++-
ucb/source/ucp/webdav-neon/webdavcontent.hxx |7 -
3 files changed, 188 insertions(+), 78 deletions(-)
New commits:
commit 5da10275a7475efdbfd9de14ea58cf8f4c6c1582
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 1 17:09:45 2013 +0100
Related rhbz#915743: Abort UCB call from SvtMatchContext_Impl::Stop
...as otherwise the SvtMatchContext_Impl thread can continue to run for
arbitrarily long, and the other thread calling Stop() and join() will block.
However, especially the WebDAV UCP does not properly support aborting
commands,
see 260afe56fd6b2f34de8290f3cdb7d1df5b88f8a8 neon commands cannot be
aborted,
so this is not yet enough to actually fix rhbz#915743 thread deadlock/slow
join in insert-hyperlink in impress.
Change-Id: I0da899f824763e1b3d19bb5b38d906feb690b623
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index dc43a3d..9791aa2 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -25,13 +25,16 @@
#include svtools/inettbc.hxx
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/beans/Property.hpp
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/sdbc/XResultSet.hpp
#include com/sun/star/sdbc/XRow.hpp
#include com/sun/star/task/XInteractionHandler.hpp
#include com/sun/star/ucb/NumberedSortingInfo.hpp
+#include com/sun/star/ucb/UniversalContentBroker.hpp
#include com/sun/star/ucb/XAnyCompareFactory.hpp
+#include com/sun/star/ucb/XCommandProcessor2.hpp
#include com/sun/star/ucb/XProgressHandler.hpp
#include com/sun/star/ucb/XContentAccess.hpp
#include com/sun/star/ucb/SortedDynamicResultSetFactory.hpp
@@ -98,10 +101,14 @@ class SvtMatchContext_Impl: public salhelper::Thread
String aBaseURL;
String aText;
SvtURLBox* pBox;
-sal_BoolbStop;
sal_BoolbOnlyDirectories;
sal_BoolbNoSelection;
+osl::Mutex mutex_;
+bool stopped_;
+css::uno::Reference css::ucb::XCommandProcessor processor_;
+sal_Int32 commandId_;
+
DECL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void* );
virtual ~SvtMatchContext_Impl();
@@ -129,9 +136,9 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
, aBaseURL( pBoxP-aBaseURL )
, aText( rText )
, pBox( pBoxP )
-, bStop( sal_False )
, bOnlyDirectories( pBoxP-bOnlyDirectories )
, bNoSelection( pBoxP-bNoSelection )
+, stopped_(false)
{
aLink.CreateMutex();
@@ -173,7 +180,19 @@ void
SvtMatchContext_Impl::FillPicklist(std::vectorrtl::OUString rPickList)
void SvtMatchContext_Impl::Stop()
{
-bStop = sal_True;
+css::uno::Reference css::ucb::XCommandProcessor proc;
+sal_Int32 id;
+{
+osl::MutexGuard g(mutex_);
+if (!stopped_) {
+stopped_ = true;
+proc = processor_;
+id = commandId_;
+}
+}
+if (proc.is()) {
+proc-abort(id);
+}
terminate();
}
@@ -193,10 +212,12 @@ void SvtMatchContext_Impl::execute( )
IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
{
// avoid recursion through cancel button
-if( pThis-bStop )
{
-// completions was stopped, no display
-return 0;
+osl::MutexGuard g(pThis-mutex_);
+if (pThis-stopped_) {
+// Completion was stopped, no display:
+return 0;
+}
}
SvtURLBox* pBox = pThis-pBox;
@@ -543,9 +564,13 @@ String SvtURLBox::ParseSmart( String aText, String
aBaseURL, String aWorkDir )
void SvtMatchContext_Impl::doExecute()
{
::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
-if( bStop )
+{
// have we been stopped while we were waiting for the mutex?
-return;
+osl::MutexGuard g(mutex_);
+if (stopped_) {
+return;
+}
+}
// Reset match lists
aCompletions.clear();
@@ -587,7 +612,81 @@ void SvtMatchContext_Impl::doExecute()
if ( aMainURL.Len() )
{
// if text input is a directory, it must be part of the
match list! Until then it is scanned
-if ( UCBContentHelper::IsFolder( aMainURL )
aURLObject.hasFinalSlash() )
+bool folder = false;
+if (aURLObject.hasFinalSlash()) {
+try {
+css::uno::Reference css::uno::XComponentContext
+ctx(comphelper::getProcessComponentContext());
+
[PATCH] Fiddle with hard-coded neon config.h to support USE_NONBLOCK...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2492 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/2492/1 Fiddle with hard-coded neon config.h to support USE_NONBLOCKING_CONNECT ...see the condition in neon's src/neon_socket.c under which USE_NONBLOCKING_CONNECT would be enabled. This should not have any immediate effect in LibreOffice, as we do not call ne_set_connect_timeout. But it might be beneficial to selectively do so in light of rhbz#915743 thread deadlock/slow join in insert-hyperlink in impress, to work around neon's disability to abort potentially blocking calls. The enabled features are hopefully POSIX-y enough to allow for plain #ifdef UNX. If not, we need to adapt this to more fine grained conditions. Change-Id: I6bf0a89c1ae73d7183f515e780fff7fe0ae2fed0 --- M neon/configs/config.h 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neon/configs/config.h b/neon/configs/config.h index 85de093..db68aa2 100644 --- a/neon/configs/config.h +++ b/neon/configs/config.h @@ -53,10 +53,14 @@ /* #undef HAVE_EXPAT */ /* Define to 1 if you have the `fcntl' function. */ -/* #undef HAVE_FCNTL */ +#ifdef UNX +#define HAVE_FCNTL 1 +#endif /* Define to 1 if you have the fcntl.h header file. */ -/* #undef HAVE_FCNTL_H */ +#ifdef UNX +#define HAVE_FCNTL_H 1 +#endif /* Define to 1 if you have the `fstat64' function. */ #define HAVE_FSTAT64 @@ -71,7 +75,9 @@ /* #undef HAVE_GETNAMEINFO */ /* Define to 1 if you have the `getsockopt' function. */ -/* #undef HAVE_GETSOCKOPT */ +#ifdef UNX +#define HAVE_GETSOCKOPT 1 +#endif /* Define if GnuTLS support is enabled */ /* #undef HAVE_GNUTLS */ @@ -234,7 +240,9 @@ #endif /* Define to 1 if the system has the type `socklen_t'. */ -/* #undef HAVE_SOCKLEN_T */ +#ifdef UNX +#define HAVE_SOCKLEN_T 1 +#endif /* Define to 1 if you have the `SSL_SESSION_cmp' function. */ /* #undef HAVE_SSL_SESSION_CMP */ -- To view, visit https://gerrit.libreoffice.org/2492 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6bf0a89c1ae73d7183f515e780fff7fe0ae2fed0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#38838, replace String with OUString
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2493
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/2493/1
fdo#38838, replace String with OUString
Change-Id: I84e49275ffc8627e93f32ae522c621d39a4eda72
---
M avmedia/source/framework/mediacontrol.cxx
M basctl/source/basicide/basdoc.cxx
M basctl/source/basicide/basdoc.hxx
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index cd22561..553d130 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -75,7 +75,7 @@
meControlStyle( eControlStyle ),
mbLocked( false )
{
-const String aTimeText( 00:00:00/00:00:00 );
+const OUString aTimeText( 00:00:00/00:00:00 );
SetBackground();
SetPaintTransparent( sal_True );
@@ -83,10 +83,10 @@
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage(
AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage(
AVMEDIA_IMG_OPEN ), OUString( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN,
HID_AVMEDIA_TOOLBOXITEM_OPEN );
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage(
AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage(
AVMEDIA_IMG_INSERT ), OUString( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT,
HID_AVMEDIA_TOOLBOXITEM_INSERT );
maPlayToolBox.InsertSeparator();
@@ -104,18 +104,18 @@
}
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage(
AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE
);
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage(
AVMEDIA_IMG_PLAY ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY,
HID_AVMEDIA_TOOLBOXITEM_PLAY );
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage(
AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ),
TIB_CHECKABLE );
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage(
AVMEDIA_IMG_PAUSE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE,
HID_AVMEDIA_TOOLBOXITEM_PAUSE );
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage(
AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE
);
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage(
AVMEDIA_IMG_STOP ), OUString( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP,
HID_AVMEDIA_TOOLBOXITEM_STOP );
maPlayToolBox.InsertSeparator();
-maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage(
AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
+maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage(
AVMEDIA_IMG_ENDLESS ), OUString( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP,
HID_AVMEDIA_TOOLBOXITEM_LOOP );
if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
@@ -147,7 +147,7 @@
if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
maMuteToolBox.InsertSeparator();
-maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage(
AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage(
AVMEDIA_IMG_MUTE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE,
HID_AVMEDIA_TOOLBOXITEM_MUTE );
maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
@@ -165,14 +165,14 @@
maMinSize.Width() += maVolumeSlider.GetSizePixel().Width();
mpZoomListBox-SetSizePixel( Size( maTimeEdit.GetSizePixel().Width(), 260
) );
-mpZoomListBox-InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 )
), AVMEDIA_ZOOMLEVEL_50 );
-mpZoomListBox-InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100 )
), AVMEDIA_ZOOMLEVEL_100 );
-mpZoomListBox-InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 )
), AVMEDIA_ZOOMLEVEL_200 );
-mpZoomListBox-InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT )
), AVMEDIA_ZOOMLEVEL_FIT );
+mpZoomListBox-InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 )
), AVMEDIA_ZOOMLEVEL_50 );
+mpZoomListBox-InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100
) ), AVMEDIA_ZOOMLEVEL_100 );
+
