[Libreoffice-commits] .: 4 commits - configure.in sal/Library_lo-bootstrap.mk solenv/gbuild
configure.in |1 + sal/Library_lo-bootstrap.mk |6 +++--- solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 12 3 files changed, 8 insertions(+), 11 deletions(-) New commits: commit ba7d9c677a865ed3355d5c85673cafe4d4b30915 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 10:41:12 2012 +0200 Should use gb_Library_add_libs and not gb_Library_add_linked_libs for system libs, says dtardon, and I trust him. Note that this crap still doesn't work any more for Android, though. Some problems with the gnustl_shared library. I have no idea where it needs to be mentioned for the bloody gbuild mechanism to understand what kind of library that is. diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index a59ad5b..995f207 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -28,9 +28,9 @@ $(eval $(call gb_Library_Library,lo-bootstrap)) # We explicitly *don't* want gb_STDLIBS to be linked here -$(eval $(call gb_Library_add_linked_libs,lo-bootstrap,\ - log \ - android \ +$(eval $(call gb_Library_add_libs,lo-bootstrap,\ + -llog \ + -landroid \ )) $(eval $(call gb_Library_add_cobjects,lo-bootstrap,\ commit b2b5357097a8a61fe80fb4f57ade0965099f61a6 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 10:39:19 2012 +0200 gb_Library_PLAINLIBS_NONE should not contain system libs, says dtardon diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index d9ed246..6f762ba 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -37,11 +37,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk gb_STDLIBS := \ gnustl_shared -gb_Library_PLAINLIBS_NONE := \ - android \ - gnustl_shared \ - log \ - # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : commit f41d8090641495a94c0f1ee6cf450543179e9cb2 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 09:44:32 2012 +0200 Reword comment to match reality better diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index 309dc6a..d9ed246 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -45,9 +45,10 @@ gb_Library_PLAINLIBS_NONE := \ # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : -# Re-define this shebang from unxgcc.mk, adding -shared and -llog -# -landroid Just temporarily done this way, shm_get promised to do -# this in some more elegant fashion. +# Re-define this from unxgcc.mk with some small but important +# changes. Just temporarily done this way, shm_get promised to +# eventually enable this to be done this in some more elegant and less +# redundant fashion. define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ commit 2a68918b6dbcb7299ad2809e97e4782ab9c4c8a8 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 08:46:13 2012 +0200 We don't need doxygen for the sub-configure diff --git a/configure.in b/configure.in index 8f3b6da..59c51f2 100644 --- a/configure.in +++ b/configure.in @@ -2944,6 +2944,7 @@ if test $cross_compiling = yes; then --disable-zenity \ --with-num-cpus=$with_num_cpus \ --with-max-jobs=$with_max_jobs \ +--without-doxygen \ $sub_conf_opts \ 21 | sed -e 's/^//' test -f ./Env.Host.sh 2/dev/null || exit ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/ANDROID_ARM_GCC.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 407542d7ed7d517e177ac17e67b2c2deb9f41bb4 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 10:59:16 2012 +0200 Revert gb_Library_PLAINLIBS_NONE should not contain system libs, says dtardon (10:49:45) dtardon: tml_, i rescinded :) dtardon tml_, hm, well, that's not really true... This reverts commit b2b5357097a8a61fe80fb4f57ade0965099f61a6. diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index 6f762ba..d9ed246 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -37,6 +37,11 @@ include $(GBUILDDIR)/platform/unxgcc.mk gb_STDLIBS := \ gnustl_shared +gb_Library_PLAINLIBS_NONE := \ + android \ + gnustl_shared \ + log \ + # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/inc framework/inc
cppuhelper/inc/cppuhelper/propertysetmixin.hxx |2 +-
framework/inc/services/detectorfactory.hxx |4
framework/inc/services/sessionlistener.hxx |4
3 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit d0e97e3db7c88f378f87a22b0cab066021df2ded
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Jan 8 23:57:05 2012 +0700
Also gives BoundListeners a CPPUHELPER_DLLPUBLIC to link on msvc
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 8c8186f..07d50c0 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -132,7 +132,7 @@ protected:
@descr See codecppu::PropertySetMixinImpl::prepareSet/code for
further details.
*/
-class BoundListeners {
+class CPPUHELPER_DLLPUBLIC BoundListeners {
public:
/**
@short The constructor.
commit 23656bda4e46ab7c00450fb0c145503a0cb0e7b5
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 6 15:44:51 2012 +0100
ENABLE_AUTODOC_FIX, WTF
diff --git a/framework/inc/services/detectorfactory.hxx
b/framework/inc/services/detectorfactory.hxx
index 0ada119..b269fc6 100644
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -130,10 +130,6 @@ class DetectorFactory : // interfaces
DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO
-#ifdef ENABLE_AUTODOC_FIX
-;
-#endif
-
//---
/** @short initialize new instance of this class.
diff --git a/framework/inc/services/sessionlistener.hxx
b/framework/inc/services/sessionlistener.hxx
index 8650cc8..1f909ae 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -139,10 +139,6 @@ class SessionListener : // interfaces
FWK_DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO
-#ifdef ENABLE_AUTODOC_FIX
-;
-#endif
-
//---
/** @short initialize new instance of this class.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/packcomponents
postprocess/packcomponents/makefile.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 6d51f16df92c255ea7006104025cf6a90a4347c8 Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com Date: Mon Jan 9 00:05:11 2012 +0700 If there is no java, don't do the java stuff diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 20726df..8d4a6b9 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -303,7 +303,6 @@ my_components += \ ado \ smplmail \ wininetbe1 \ - component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ component/dtrans/source/generic/dtrans \ component/dtrans/util/dnd \ component/dtrans/util/ftransl \ @@ -311,6 +310,10 @@ my_components += \ component/fpicker/util/fop \ component/fpicker/util/fps \ component/vcl/vcl.windows +.IF $(SOLAR_JAVA) == TRUE +my_components += \ + component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge +.END .END .IF $(OS) != MACOSX $(OS) != WNT $(OS) != IOS $(OS) != ANDROID ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/update/check/updatecheck.cxx |6 +++
extensions/source/update/check/updatecheck.hxx | 38 +
2 files changed, 26 insertions(+), 18 deletions(-)
New commits:
commit 2fa19ed7e407188d6af028aad19a2598454959a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 9 11:09:17 2012 +0100
Export from UpdateCheck only what is needed in test_update.cxx.
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 9d8c7b9..2db3a53 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -757,6 +757,12 @@ void SAL_CALL ShutdownThread::onTerminated()
//--
+UpdateCheck::UpdateCheck():
+m_eState(NOT_INITIALIZED), m_eUpdateState(UPDATESTATES_COUNT),
+m_pThread(NULL)
+{};
+
+UpdateCheck::~UpdateCheck() {}
void
UpdateCheck::initialize(const uno::Sequence beans::NamedValue rValues,
diff --git a/extensions/source/update/check/updatecheck.hxx
b/extensions/source/update/check/updatecheck.hxx
index d6db5e8..a62a467 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -58,14 +58,16 @@ public:
virtual void SAL_CALL cancel() = 0;
};
-class SAL_DLLPUBLIC_EXPORT UpdateCheck :
+class UpdateCheck :
public UpdateCheckConfigListener,
public IActionListener,
public DownloadInteractionHandler,
public salhelper::ReferenceObject,
public rtl::StaticWithInit rtl::Reference UpdateCheck ,
UpdateCheckInitData
{
-UpdateCheck() : m_eState(NOT_INITIALIZED),
m_eUpdateState(UPDATESTATES_COUNT), m_pThread(NULL) {};
+SAL_DLLPUBLIC_EXPORT UpdateCheck();
+
+virtual ~UpdateCheck();
public:
inline SAL_CALL operator rtl::Reference UpdateCheckConfigListener ()
@@ -107,13 +109,13 @@ public:
bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength()
0); }
// DownloadInteractionHandler
-SAL_DLLPUBLIC_EXPORT virtual bool downloadTargetExists(const
rtl::OUString rFileName);
-SAL_DLLPUBLIC_EXPORT virtual void downloadStalled(const rtl::OUString
rErrorMessage);
-SAL_DLLPUBLIC_EXPORT virtual void downloadProgressAt(sal_Int8 nProcent);
-SAL_DLLPUBLIC_EXPORT virtual void downloadStarted(const rtl::OUString
rLocalFileName, sal_Int64 nFileSize);
-SAL_DLLPUBLIC_EXPORT virtual void downloadFinished(const rtl::OUString
rLocalFileName);
+virtual bool downloadTargetExists(const rtl::OUString rFileName);
+virtual void downloadStalled(const rtl::OUString rErrorMessage);
+virtual void downloadProgressAt(sal_Int8 nProcent);
+virtual void downloadStarted(const rtl::OUString rLocalFileName,
sal_Int64 nFileSize);
+virtual void downloadFinished(const rtl::OUString rLocalFileName);
// checks if the download target already exists and asks user what to do
next
-SAL_DLLPUBLIC_EXPORT virtual bool checkDownloadDestination( const
rtl::OUString rFile );
+virtual bool checkDownloadDestination( const rtl::OUString rFile );
// Cancels the download action (and resumes checking if enabled)
void cancelDownload();
@@ -122,20 +124,20 @@ public:
SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference
com::sun::star::task::XInteractionHandler getInteractionHandler() const;
// UpdateCheckConfigListener
-SAL_DLLPUBLIC_EXPORT virtual void autoCheckStatusChanged(bool enabled);
-SAL_DLLPUBLIC_EXPORT virtual void autoCheckIntervalChanged();
+virtual void autoCheckStatusChanged(bool enabled);
+virtual void autoCheckIntervalChanged();
// IActionListener
-SAL_DLLPUBLIC_EXPORT void cancel();
-SAL_DLLPUBLIC_EXPORT void download();
-SAL_DLLPUBLIC_EXPORT void install();
-SAL_DLLPUBLIC_EXPORT void pause();
-SAL_DLLPUBLIC_EXPORT void resume();
-SAL_DLLPUBLIC_EXPORT void closeAfterFailure();
+void cancel();
+void download();
+void install();
+void pause();
+void resume();
+void closeAfterFailure();
// rtl::IReference
-SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL acquire()
SAL_THROW(());
-SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL release()
SAL_THROW(());
+virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
+virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
private:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source
svtools/inc/svtools/valueset.hxx| 218 +--- svtools/source/control/valueset.cxx | 101 +++- 2 files changed, 151 insertions(+), 168 deletions(-) New commits: commit 9ec31184f7d68777b601f3398c1dae930b7ead42 Author: Tim Hardeck thard...@suse.com Date: Thu Jan 5 14:15:37 2012 +0100 translated German comments in valueset.hxx Translated German comments in svtools/inc/svtools/valueset.hxx. diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index ad78ce8..54e8319 100644 --- a/svtools/inc/svtools/valueset.hxx +++ b/svtools/inc/svtools/valueset.hxx @@ -54,24 +54,23 @@ class ValueItemAcc; /* -Beschreibung +Description class ValueSet -Diese Klasse erlaubt die Auswahl eines Items. Dabei werden die Items -nebeneinander dargestellt. Die Auswahl der Items kann zum Beispiel bei -Farben oder Mustern uebersichtlicher sein, als in ListBox-Form. Es kann -angegeben werden, wieviele Spalten das Control anzeigen soll und ob die -Items umrandet werden sollen oder nicht. Optional kann auch ein -NoSelection-Feld oder ein Namenfeld angezeigt werden. An Items werden -standardmaessig Image, und Color unterstuetzt. Falls InsertItem() -nur mit einer ID aufgerufen wird, kann man die Items auch selber malen. -Dazu muss dann jedoch der UserDraw-Handler ueberlagert werden. Bei -UserDraw-Items, wie auch bei allen anderen Items kann der Beschreibungstext -auch hinterher gesetzt bzw. umgesetzt werden. +This class allows the selection of an item. In the process items are +drawn side by side. The selection of items can be more clear than in a +ListBox shape for example in case of colors or samples. +The amount of columns drawn by the control and wether the items +should be encircled can be specified. Optional a NoSelection or name +field could be shown. By default image and color items are supported. +Items could be drawn by oneself if InsertItem() is only called with +an ID. To achieve this the UserDraw handler needs to be overloaded. The +description text could be specified afterwards in case of UserDraw +and any other items. -Querverweise +Cross references class ListBox @@ -79,129 +78,118 @@ class ListBox WinBits -WB_RADIOSEL Wenn dieses Flag gesetzt wird, wird im ValueSet die -Selektion so gezeichnet, wie bei einem ImageRadioButton. -Dies ist jedoch nur sinnvoll, wenn die Images min. 8 Pixel -in horizontaler und vertikaler Richtung kleiner sind -als der Item-Bereich, WB_DOUBLEBORDER gesetzt ist und -als Color COL_WINDOWWORKSPACE gesetzt ist. +WB_RADIOSEL If set the selection will be drawn like an +ImageRadioButton. This does only make sense if the image +is at least 8 pixel smaller on each side than the item +and also WB_DOUBLEBORDER is set and as color +COL_WINDOWWORKSPACE is specified. WB_FLATVALUESET Flat Look (if you set WB_ITEMBORDER or WB_DOUBLEBORDER, then you get extra border space, but the Borders aren't painted), -WB_ITEMBORDER Die Items werden umrandet -WB_DOUBLEBORDER Die Items werden doppelt umrandet. Zusaetzlich muss -WB_ITEMBORDER gesetzt werden, ansonsten hat dieses -WinBit keine Auswirkung. Gebraucht wird dies, wenn man -Items mit weissem Hintergrund hat, da sonst der 3D Effekt -nicht mehr sichtbar ist. -WB_NAMEFIELDEs gibt ein Namensfeld, wo der Name eines Items -mit angezeigt wird -WB_NONEFIELDEs gibt ein NoSelection-Feld. Dieses kann selektiert -werden, wenn bei SelectItem 0 uebergeben wird. Bei -GetSelectItemId() wird entsprechend 0 zurueckgegeben -wenn dieses Feld selektiert ist, bzw. keines selektiert -wurde. Dieses Feld zeigt den Text an, der mit SetText() -gesetzt wurde, bzw. keinen, wenn kein Text gesetzt -wurde. Mit SetNoSelection() kann die Selektion ganz -ausgeschaltet werden. -WB_VSCROLL Es wird immer ein ScrollBar angezeigt. Wenn dieses Flag -gesetzt wird, muss auch immer mit SetLineCount() die -sichtbare Anzahl der Zeilen eingestellt werden. -WB_BORDER Um das Fenster wird ein Border gezeichnet. -WB_NOPOINTERFOCUS Der Focus wird sich nicht geholt, wenn mit der Maus in -das Control geklickt wird. -WB_TABSTOP Mit der TabTaste kann in das ValueSet gesprungen werden. -WB_NOTABSTOPMit der TabTaste kann nicht in das ValueSet gesprungen -werden. +WB_ITEMBORDER Items will be bordered
[Libreoffice-commits] .: vcl/source
vcl/source/control/combobox.cxx | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 04292aee154d03e87395722d314c60be6c10b2ec
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Jan 9 11:53:48 2012 +0100
Replace Table with std::set.
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 584e493..97abfc1 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,6 +27,7 @@
/
+#include set
#include comphelper/string.hxx
#include tools/table.hxx
#include tools/debug.hxx
@@ -44,15 +45,7 @@
// ===
-inline sal_uLong ImplCreateKey( sal_uInt16 nPos )
-{
-// Key = Pos+1, wegen Pos 0
-return nPos+1;
-}
-
-// ---
-
-static void lcl_GetSelectedEntries( Table rSelectedPos, const XubString
rText, xub_Unicode cTokenSep, const ImplEntryList* pEntryList )
+static void lcl_GetSelectedEntries( ::std::set sal_uInt16 rSelectedPos,
const XubString rText, xub_Unicode cTokenSep, const ImplEntryList* pEntryList )
{
for (xub_StrLen n = comphelper::string::getTokenCount(rText, cTokenSep);
n;)
{
@@ -60,7 +53,7 @@ static void lcl_GetSelectedEntries( Table rSelectedPos,
const XubString rText,
aToken = comphelper::string::strip(aToken, ' ');
sal_uInt16 nPos = pEntryList-FindEntry( aToken );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-rSelectedPos.Insert( ImplCreateKey( nPos ), (void*)sal_IntPtr(1L)
);
+rSelectedPos.insert( nPos );
}
}
@@ -417,13 +410,13 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG )
}
// Fehlende Eintraege anhaengen...
-Table aSelInText;
+::std::set sal_uInt16 aSelInText;
lcl_GetSelectedEntries( aSelInText, aText, mcMultiSep,
mpImplLB-GetEntryList() );
sal_uInt16 nSelectedEntries =
mpImplLB-GetEntryList()-GetSelectEntryCount();
for ( sal_uInt16 n = 0; n nSelectedEntries; n++ )
{
sal_uInt16 nP = mpImplLB-GetEntryList()-GetSelectEntryPos( n
);
-if ( !aSelInText.IsKeyValid( ImplCreateKey( nP ) ) )
+if ( !aSelInText.count( nP ) )
{
if ( aText.Len() (aText.GetChar( aText.Len()-1 ) !=
mcMultiSep) )
aText += mcMultiSep;
@@ -952,10 +945,10 @@ void ComboBox::ImplUpdateFloatSelection()
}
else
{
-Table aSelInText;
+::std::set sal_uInt16 aSelInText;
lcl_GetSelectedEntries( aSelInText, mpSubEdit-GetText(), mcMultiSep,
mpImplLB-GetEntryList() );
for ( sal_uInt16 n = 0; n mpImplLB-GetEntryList()-GetEntryCount();
n++ )
-mpImplLB-SelectEntry( n, aSelInText.IsKeyValid( ImplCreateKey( n
) ) );
+mpImplLB-SelectEntry( n, aSelInText.count( n ) );
}
mpImplLB-SetCallSelectionChangedHdl( sal_True );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in set_soenv.in
configure.in | 18 --
set_soenv.in |8 ++--
2 files changed, 2 insertions(+), 24 deletions(-)
New commits:
commit 0759e36f887f5612ecd84efe8f9397a35a10a7fd
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Jan 9 12:49:35 2012 +0200
Kill --with-local-solver
diff --git a/configure.in b/configure.in
index 59c51f2..204065b 100644
--- a/configure.in
+++ b/configure.in
@@ -1598,14 +1598,6 @@ AC_ARG_WITH(mozilla-build,
MOZILLABUILD=$withval ,
)
-AC_ARG_WITH(local-solver,
-AS_HELP_STRING([--with-local-solver],
-[If you have solver in a location other than ./solver, please supply
the path here.])
-[
- Usage: --with-local-solver=abs. path to solver
-],
-,)
-
AC_ARG_WITH(lang,
AS_HELP_STRING([--with-lang],
[Use this option to build LibreOffice with additional language support.
@@ -10395,16 +10387,6 @@ if test -z $COMPATH; then
fi
AC_SUBST(COMPATH)
-AC_MSG_CHECKING([solver path])
-if test -z $with_local_solver; then
-LOCAL_SOLVER=DEFAULT
-AC_MSG_RESULT([default])
-else
-LOCAL_SOLVER=$with_local_solver
-AC_MSG_RESULT([$with_local_solver])
-fi
-AC_SUBST(LOCAL_SOLVER)
-
AC_SUBST(BUILD_TYPE)
if test $WITH_MINGW != yes ; then
diff --git a/set_soenv.in b/set_soenv.in
index 57ccb36..129d4f3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -428,12 +428,8 @@ if ('@TARFILE_LOCATION@' eq DEFAULT)
#
$SOLARENV = PathFormat($SRC_ROOT.$SOLENV);
# Location of the solver tree.
-if ('@LOCAL_SOLVER@' eq DEFAULT)
-{ $SOLARVER = $SRC_ROOT.$SOLVER;
-}
-else
-{ $SOLARVER = PathFormat('@LOCAL_SOLVER@');
-}
+$SOLARVER = $SRC_ROOT.$SOLVER;
+
#Location of Solar version.
$SOLARVERSION = '$SOLARVER';
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/filter/merge/FCFGMerge.java |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 869cf02e7cf20dc25a55b6d3898fc94c5c0ed2ed
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Jan 9 11:31:03 2012 +
advertise license in help output
diff --git a/l10ntools/source/filter/merge/FCFGMerge.java
b/l10ntools/source/filter/merge/FCFGMerge.java
index ca1959b..d35e641 100644
--- a/l10ntools/source/filter/merge/FCFGMerge.java
+++ b/l10ntools/source/filter/merge/FCFGMerge.java
@@ -100,9 +100,12 @@ public class FCFGMerge
private static void printCopyright()
{
java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
-sOut.append(FCFGMerge\n);
-sOut.append(Copyright: 2003 by Sun Microsystems, Inc.\n);
-sOut.append(All Rights Reserved.\n);
+sOut.append(FCFGMerge (LibreOffice)\n\n);
+sOut.append(Copyright (C) 2003 Sun Microsystems, Inc.\n);
+sOut.append(Copyright (C) 2012 The Document Foundation\n);
+sOut.append(License LGPLv3: GNU LGPL version 3
http://www.gnu.org/licenses/lgpl.html.\n);
+sOut.append(This is free software: you are free to change and
redistribute it.\n);
+sOut.append(There is NO WARRANTY, to the extent permitted by law.\n);
System.out.println(sOut.toString());
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - l10ntools/source
l10ntools/source/filter/merge/FCFGMerge.java |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit eeeffe30806fffcd8ec1dcabfae7a81a2afefb7c
Author: Marcel Metz mm...@adrian-broher.net
Date: Mon Jan 9 11:31:03 2012 +
advertise license in help output
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/l10ntools/source/filter/merge/FCFGMerge.java
b/l10ntools/source/filter/merge/FCFGMerge.java
index 378f7de..3f2ec37 100644
--- a/l10ntools/source/filter/merge/FCFGMerge.java
+++ b/l10ntools/source/filter/merge/FCFGMerge.java
@@ -101,9 +101,12 @@ public class FCFGMerge
private static void printCopyright()
{
java.lang.StringBuffer sOut = new java.lang.StringBuffer(256);
-sOut.append(FCFGMerge\n);
-sOut.append(Copyright: 2003 by Sun Microsystems, Inc.\n);
-sOut.append(All Rights Reserved.\n);
+sOut.append(FCFGMerge (LibreOffice)\n\n);
+sOut.append(Copyright (C) 2003 Sun Microsystems, Inc.\n);
+sOut.append(Copyright (C) 2012 The Document Foundation\n);
+sOut.append(License LGPLv3: GNU LGPL version 3
http://www.gnu.org/licenses/lgpl.html.\n);
+sOut.append(This is free software: you are free to change and
redistribute it.\n);
+sOut.append(There is NO WARRANTY, to the extent permitted by law.\n);
System.out.println(sOut.toString());
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/Library_pl.mk extensions/source
extensions/Library_pl.mk |4
extensions/source/plugin/aqua/macmgr.cxx | 654 ---
extensions/source/plugin/aqua/macmgr.mm | 654 +++
3 files changed, 655 insertions(+), 657 deletions(-)
New commits:
commit 29f897054d472746ce0cf59a39142ec5ec3114c1
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jan 9 12:41:51 2012 +0100
extensions/Library_pl: move macmgr.cxx - macmgr.mm
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index cf74ce8..b6a3700 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -93,10 +93,8 @@ ifeq ($(GUI),UNX)
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_add_exception_objects,pl,\
- extensions/source/plugin/aqua/macmgr \
-))
$(eval $(call gb_Library_add_objcxxobjects,pl,\
+ extensions/source/plugin/aqua/macmgr \
extensions/source/plugin/aqua/sysplug \
))
diff --git a/extensions/source/plugin/aqua/macmgr.cxx
b/extensions/source/plugin/aqua/macmgr.cxx
deleted file mode 100644
index 3b69845..000
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ /dev/null
@@ -1,654 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include rtl/ustrbuf.hxx
-#include rtl/strbuf.hxx
-
-#include plugin/impl.hxx
-#include osl/file.h
-#include osl/module.hxx
-
-using namespace std;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::plugin;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
-
-namespace plugstringhelper
-{
-
-rtl::OUString getString( CFStringRef i_xString )
-{
-rtl::OUStringBuffer aBuf;
-if( i_xString )
-{
-CFIndex nChars = CFStringGetLength( i_xString );
-CFRange aRange = { 0, nChars };
-aBuf.setLength( nChars );
-CFStringGetCharacters( i_xString, aRange, static_cast UniChar*
(const_castsal_Unicode*(aBuf.getStr())) );
-}
-return aBuf.makeStringAndClear();
-}
-
-rtl::OUString getString( CFURLRef i_xURL )
-{
-CFStringRef xString = CFURLGetString( i_xURL );
-return getString( xString );
-}
-
-CFMutableStringRef createString( const rtl::OUString i_rString )
-{
-CFMutableStringRef xString = CFStringCreateMutable( NULL, 0 );
-if( xString )
-CFStringAppendCharacters( xString, i_rString.getStr(),
i_rString.getLength() );
-return xString;
-}
-
-CFURLRef createURL( const rtl::OUString i_rString )
-{
-
-CFMutableStringRef xMutableString = createString( i_rString );
-CFURLRef xURL = CFURLCreateWithString( NULL, xMutableString, NULL );
-CFRelease( xMutableString );
-return xURL;
-}
-
-rtl::OUString getURLFromPath( const rtl::OUString i_rPath )
-{
-CFMutableStringRef xMutableString = createString( i_rPath );
-CFURLRef xURL = CFURLCreateWithFileSystemPath( NULL, xMutableString,
kCFURLPOSIXPathStyle, true );
-CFRelease( xMutableString );
-CFStringRef xString = CFURLGetString( xURL );
-rtl::OUString aRet = getString( xString );
-CFRelease( xURL );
-return aRet;
-}
-
-CFURLRef createURLFromPath( const rtl::OUString i_rPath )
-{
-CFMutableStringRef xMutableString = createString( i_rPath );
-CFURLRef xURL = CFURLCreateWithFileSystemPath( NULL, xMutableString,
kCFURLPOSIXPathStyle, true );
-return xURL;
-}
-
-rtl::OUString CFURLtoOSLURL( CFURLRef i_xURL )
-{
-// make URL absolute
-CFURLRef xAbsURL = CFURLCopyAbsoluteURL( i_xURL );
-// copy system path
-CFStringRef xSysPath = CFURLCopyFileSystemPath( xAbsURL ? xAbsURL :
i_xURL, kCFURLPOSIXPathStyle );
-if( xAbsURL )
-CFRelease( xAbsURL );
-rtl::OUString aSysPath( getString( xSysPath ) );
-CFRelease(
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/ANDROID_ARM_GCC.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 89875941688ac94c7d9ddcee141bc16d1688 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 9 13:40:47 2012 +0200 No need to mention the system log library, it clashes with our log library It is not needed anyway. Only liblo-bootstrap uses the log API now, our libraries on Android (including executables) don't. diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index d9ed246..1a7e56e 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -40,7 +40,6 @@ gb_STDLIBS := \ gb_Library_PLAINLIBS_NONE := \ android \ gnustl_shared \ - log \ # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d979e52a6a8cf05da31a10bd2e5ecad1b19dddc7 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 9 13:55:27 2012 +0100 gbuild: add urlmon library for MSVC diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 284572a..0c953f1 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -413,6 +413,7 @@ gb_Library_PLAINLIBS_NONE += \ oleaut32 \ shell32 \ shlwapi \ + urlmon \ user32 \ uuid \ version \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/sbx/sbxvalue.cxx | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) New commits: commit 9df90559d40f029479c4481e31f88737b70742f6 Author: Noel Power noel.po...@novell.com Date: Mon Jan 9 13:09:37 2012 + restore special DATE handling code for SbxValue::Compute restore code that seemed to be erroneously moved as part of the currency enhancement feature diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 7f00ecc..add49e1 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1264,16 +1264,6 @@ Lbl_OpIsDouble: else aL.nDouble /= aR.nDouble; break; case SbxPLUS: aL.nDouble += aR.nDouble; break; -#if 0 -// See 'break' on preceding line... this -// is unreachable code. Do not delete this -// #if 0 block unless you know for sure -// the 'break' above is intentional. - -// #45465 Date needs with + a special handling: forces date type -if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) -aL.eType = SbxDATE; -#endif case SbxMINUS: aL.nDouble -= aR.nDouble; break; case SbxNEG: @@ -1281,6 +1271,9 @@ Lbl_OpIsDouble: default: SetError( SbxERR_NOTIMP ); } +// #45465 Date needs with + a special handling: forces date type +if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) +aL.eType = SbxDATE; } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_sc/source/core/data/sc_document.cxx |5 --
binfilter/bf_sc/source/core/tool/sc_addincol.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 10 +---
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx |2
binfilter/bf_sc/source/core/tool/sc_userlist.cxx |7 +--
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx |2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx |2
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 18
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx |2
binfilter/bf_svtools/source/numbers/svt_zformat.cxx |6 +-
binfilter/bf_svtools/source/numbers/svt_zforscan.cxx | 40 +--
binfilter/bf_svx/source/items/svx_svxfont.cxx|6 +-
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 18 +++-
binfilter/bf_sw/source/core/doc/sw_docdde.cxx|8 +--
binfilter/bf_sw/source/core/doc/sw_docfld.cxx|2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |2
17 files changed, 65 insertions(+), 73 deletions(-)
New commits:
commit a4a9f044294ae2afad3ecee138c771a3654add98
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 23:09:49 2012 +
track changes to CharClass
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index dc9b4ea..1f00d00 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -132,15 +132,14 @@ namespace binfilter {
/*N*/ BOOL ScDocument::GetTable( const String rName, USHORT rTab ) const
/*N*/ {
-/*N*/ String aUpperName = rName;
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
+/*N*/ String aUpperName = ScGlobal::pCharClass-uppercase(rName);
/*N*/ String aCompName;
/*N*/
/*N*/ for (USHORT i=0; i=MAXTAB; i++)
/*N*/ if (pTab[i])
/*N*/ {
/*N*/ pTab[i]-GetName( aCompName );
-/*N*/ ScGlobal::pCharClass-toUpper(aCompName);
+/*N*/ aCompName = ScGlobal::pCharClass-uppercase(aCompName);
/*N*/ if (aUpperName == aCompName)
/*N*/ {
/*N*/ rTab = i;
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 0fbac52..f409574 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -170,8 +170,8 @@ public:
/*N*/ else
/*N*/ pArgDescs = NULL;
/*N*/
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperLocal);
+/*N*/ aUpperName = ScGlobal::pCharClass-uppercase(aUpperName);
+/*N*/ aUpperLocal = ScGlobal::pCharClass-uppercase(aUpperLocal);
/*N*/ }
/*N*/ ScUnoAddInFuncData::~ScUnoAddInFuncData()
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index e67a51f..3653762 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -1467,7 +1467,7 @@ namespace binfilter {
/*N*/ bMayBeFuncName = TRUE; // operators and other
opcodes
/*N*/
/*N*/ String aOrg( cSymbol ); // evtl. Dateinamen in IsReference
erhalten
-/*N*/ String aUpper( ScGlobal::pCharClass-upper( aOrg ) );
+/*N*/ String aUpper( ScGlobal::pCharClass-uppercase( aOrg ) );
/*N*/ // Spalte DM konnte nicht referiert werden, IsReference vor
IsValue
/*N*/ // #42016# italian ARCTAN.2 gab #REF! = IsOpCode vor
IsReference
/*N*/ if ( !(bMayBeFuncName IsOpCode( aUpper ))
@@ -1482,7 +1482,7 @@ namespace binfilter {
/*N*/ SetError( errNoName );
/*N*/ if ( bAutoCorrect )
/*N*/ { // provide single token information and continue
-/*?*/ ScGlobal::pCharClass-toLower( aUpper );
+/*?*/ aUpper = ScGlobal::pCharClass-lowercase( aUpper );
/*?*/ aToken.SetString( aUpper.GetBuffer() );
/*?*/ aToken.NewOpCode( ocBad );
/*?*/ pRawToken = aToken.Clone();
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 5b33047..9eb51bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1657,8 +1657,7 @@ void ScInterpreter::ScTrim()
void ScInterpreter::ScUpper()
{
-String aString = GetString();
-ScGlobal::pCharClass-toUpper(aString);
+String aString = ScGlobal::pCharClass-uppercase(GetString());
PushString(aString);
}
@@ -1672,8 +1671,8 @@ void ScInterpreter::ScPropper()
// (would crash now that the empty string is const)
if ( nLen 0 )
{
-String aUpr(
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 7ec8f13d3ac0650c7e62e31220f1eda9d0a9284c
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jan 9 14:58:42 2012 +0100
fdo#42151 fix RTF import of vertically merged table cells
The problem was that \row took care of states (which is right, since
\trowd wants to reset row properties to the default state), but it
should not respect state pops.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 06fc047..6c8e8d7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2734,6 +2734,7 @@ int RTFDocumentImpl::popState()
bool bFaltEnd = false;
RTFFrame aFrame;
bool bPopFrame = false;
+RTFParserState aState(m_aStates.top());
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
{
@@ -3148,6 +3149,12 @@ int RTFDocumentImpl::popState()
m_pCurrentBuffer = 0;
m_bHasFootnote = false;
}
+if (m_aStates.size())
+{
+m_aStates.top().nCells = aState.nCells;
+m_aStates.top().aTableCellsSprms = aState.aTableCellsSprms;
+m_aStates.top().aTableCellsAttributes = aState.aTableCellsAttributes;
+}
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2df1c40b4b7cb3107a68984db644f10097f04c3c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 9 15:51:10 2012 +0100
don't use an invalidated iterator
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b23bcc0..df37cf0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -518,7 +518,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData*
pRedlineData )
void DocxAttributeOutput::EndRun()
{
// Write field starts
-for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); ++pIt )
+for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); )
{
// Add the fields starts for all but hyperlinks and TOCs
if ( pIt-bOpen pIt-pField )
@@ -529,10 +529,11 @@ void DocxAttributeOutput::EndRun()
// Unknown fields sould be removed too
if ( !pIt-bClose || ( pIt-eType == ww::eUNKNOWN ) )
{
-m_Fields.erase( pIt );
---pIt;
+pIt = m_Fields.erase( pIt );
+continue;
}
}
+++pIt;
}
// write the run properties + the text, already in the correct order
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - basctl/uiconfig default_images/cmd officecfg/registry ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial
basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml | 15 -- default_images/cmd/lc_insertformcheck.png |binary default_images/cmd/lc_insertformcombo.png |binary default_images/cmd/lc_insertformhscroll.png |binary default_images/cmd/lc_insertformlist.png |binary default_images/cmd/lc_insertformradio.png |binary default_images/cmd/lc_insertformspin.png |binary default_images/cmd/lc_insertformvscroll.png |binary default_images/cmd/sc_insertformcheck.png |binary default_images/cmd/sc_insertformcombo.png |binary default_images/cmd/sc_insertformhscroll.png |binary default_images/cmd/sc_insertformlist.png |binary default_images/cmd/sc_insertformradio.png |binary default_images/cmd/sc_insertformspin.png |binary default_images/cmd/sc_insertformvscroll.png |binary officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu | 14 - ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformlist.png|binary ooo_custom_images/hicontrast/cmd/lc_insertformradio.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformspin.png|binary ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformlist.png|binary ooo_custom_images/hicontrast/cmd/sc_insertformradio.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformspin.png|binary ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png |binary ooo_custom_images/human/cmd/lc_insertformcheck.png|binary ooo_custom_images/human/cmd/lc_insertformcombo.png|binary ooo_custom_images/human/cmd/lc_insertformhscroll.png |binary ooo_custom_images/human/cmd/lc_insertformlist.png |binary ooo_custom_images/human/cmd/lc_insertformradio.png|binary ooo_custom_images/human/cmd/lc_insertformspin.png |binary ooo_custom_images/human/cmd/lc_insertformvscroll.png |binary ooo_custom_images/human/cmd/sc_insertformcheck.png|binary ooo_custom_images/human/cmd/sc_insertformcombo.png|binary ooo_custom_images/human/cmd/sc_insertformhscroll.png |binary ooo_custom_images/human/cmd/sc_insertformlist.png |binary ooo_custom_images/human/cmd/sc_insertformradio.png|binary ooo_custom_images/human/cmd/sc_insertformspin.png |binary ooo_custom_images/human/cmd/sc_insertformvscroll.png |binary ooo_custom_images/industrial/cmd/lc_insertformcheck.png |binary ooo_custom_images/industrial/cmd/lc_insertformcombo.png |binary ooo_custom_images/industrial/cmd/lc_insertformhscroll.png |binary ooo_custom_images/industrial/cmd/lc_insertformlist.png|binary ooo_custom_images/industrial/cmd/lc_insertformradio.png |binary ooo_custom_images/industrial/cmd/lc_insertformvscroll.png |binary ooo_custom_images/industrial/cmd/sc_insertformcheck.png |binary ooo_custom_images/industrial/cmd/sc_insertformcombo.png |binary ooo_custom_images/industrial/cmd/sc_insertformhscroll.png |binary ooo_custom_images/industrial/cmd/sc_insertformlist.png|binary ooo_custom_images/industrial/cmd/sc_insertformradio.png |binary ooo_custom_images/industrial/cmd/sc_insertformvscroll.png |binary ooo_custom_images/oxygen/cmd/lc_insertformcheck.png |binary ooo_custom_images/oxygen/cmd/lc_insertformcombo.png |binary ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png |binary ooo_custom_images/oxygen/cmd/lc_insertformlist.png|binary ooo_custom_images/oxygen/cmd/lc_insertformradio.png |binary ooo_custom_images/oxygen/cmd/lc_insertformspin.png|binary ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png |binary
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 00a2444e051aaa2495b20a651f3ae096b4ff3cad
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jan 9 14:58:42 2012 +0100
fdo#42151 fix RTF import of vertically merged table cells
The problem was that \row took care of states (which is right, since
\trowd wants to reset row properties to the default state), but it
should not respect state pops.
(cherry picked from commit 7ec8f13d3ac0650c7e62e31220f1eda9d0a9284c)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 02a6cef..25c2e2d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2744,6 +2744,7 @@ int RTFDocumentImpl::popState()
bool bFaltEnd = false;
RTFFrame aFrame;
bool bPopFrame = false;
+RTFParserState aState(m_aStates.top());
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
{
@@ -3158,6 +3159,12 @@ int RTFDocumentImpl::popState()
m_pCurrentBuffer = 0;
m_bHasFootnote = false;
}
+if (m_aStates.size())
+{
+m_aStates.top().nCells = aState.nCells;
+m_aStates.top().aTableCellsSprms = aState.aTableCellsSprms;
+m_aStates.top().aTableCellsAttributes = aState.aTableCellsAttributes;
+}
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - desktop/source
desktop/source/app/cmdlineargs.cxx |3 ++-
desktop/source/app/cmdlinehelp.cxx | 26 +-
2 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 3a493feeb0580de4b0970a591eb3f29c92840116
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 16:43:06 2012 +0100
don't warn for -h/-?/-o/-n command line switches
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index af772c2..e9ca422 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -421,7 +421,8 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter(
const ::rtl::OUString
}
else if (aArg.toChar() == '-')
{
-bDeprecated = true;
+if ( aArg.getLength() 2 ) // -h, -o, -n, -? are still valid
+bDeprecated = true;
oArg = ::rtl::OUString(aArg.getStr()+1, aArg.getLength()-1);
}
else
commit daa7eef6349daa36df78863f21a38d7c6eb5cb52
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 16:36:02 2012 +0100
fix switches (--) and typos
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index b67a010..63f14e8 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -79,8 +79,8 @@ namespace desktop
--math \n\
--global \n\
--web \n\
--o\n\
--n\n;
+-o \n\
+-n \n;
const char *aCmdLineHelp_right =
keep startup bitmap minimized.\n\
no startup screen, no default document and no UI.\n\
@@ -117,21 +117,21 @@ namespace desktop
Specify an UNO connect-string to create an UNO acceptor through
which\n\
other programs can connect to access the API\n\
--unaccept=accept-string\n\
- Close an acceptor that was created with
-accept=accept-string\n\
- Use -unnaccept=all to close all open acceptors\n\
+ Close an acceptor that was created with
--accept=accept-string\n\
+ Use --unnaccept=all to close all open acceptors\n\
--infilter=filter\n\
Force an input filter type if possible\n\
- Eg. -infilter=\Calc Office Open XML\\n\
---convert-to output_file_extension[:output_filter_name] [-outdir
ouput_dir] files\n\
+ Eg. --infilter=\Calc Office Open XML\\n\
+--convert-to output_file_extension[:output_filter_name] [--outdir
output_dir] files\n\
Batch convert files.\n\
- If -outdir is not specified then current working dir is used as
output_dir.\n\
- Eg. -convert-to pdf *.doc\n\
- -convert-to pdf:writer_pdf_Export -outdir /home/user
*.doc\n\
---print-to-file [-printer-name printer_name] [-outdir ouput_dir]
files\n\
+ If --outdir is not specified then current working dir is used
as output_dir.\n\
+ Eg. --convert-to pdf *.doc\n\
+ --convert-to pdf:writer_pdf_Export --outdir /home/user
*.doc\n\
+--print-to-file [-printer-name printer_name] [--outdir output_dir]
files\n\
Batch print files to file.\n\
- If -outdir is not specified then current working dir is used as
output_dir.\n\
- Eg. -print-to-file *.doc\n\
- -print-to-file -printer-name nasty_lowres_printer -outdir
/home/user *.doc\n\
+ If --outdir is not specified then current working dir is used
as output_dir.\n\
+ Eg. --print-to-file *.doc\n\
+ --print-to-file --printer-name nasty_lowres_printer
--outdir /home/user *.doc\n\
\nRemaining arguments will be treated as filenames or URLs of
documents to open.\n\n;
void ReplaceStringHookProc( UniString rStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.11.patch libvisio/libvisio-0.0.12.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.11.patch | 20 libvisio/libvisio-0.0.12.patch | 20 libvisio/makefile.mk |6 +++--- ooo.lst.in |2 +- 4 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 2edc5a8fdb50b8fc2916fc1501477dbfe0e5c418 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 9 16:53:01 2012 +0100 Uploading new release of libvisio (0.0.12) - Ability to parse and extract OLE objects embedded in Visio files - Fix a bug with overkeen path closing algorithm diff --git a/libvisio/libvisio-0.0.11.patch b/libvisio/libvisio-0.0.11.patch deleted file mode 100644 index 91e9700..000 --- a/libvisio/libvisio-0.0.11.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.11/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.11/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch new file mode 100644 index 000..c9e626c --- /dev/null +++ b/libvisio/libvisio-0.0.12.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.12/src/lib/libvisio_utils.h misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa99223..a14fb8d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.11 -TARFILE_MD5=a8b25a0bf696fd126a08319d88998492 +TARFILE_NAME=libvisio-0.0.12 +TARFILE_MD5=053a35c244bf132f806e198ac4d960aa PATCH_FILES=\ -libvisio-0.0.11.patch +$(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index 9085d9c..a8f540e 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 +053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/source
desktop/source/app/cmdlineargs.cxx |3 ++-
desktop/source/app/cmdlinehelp.cxx | 26 +-
2 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit b0cb633d6e3369936a63501933f47f291a4760b7
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 16:43:06 2012 +0100
don't warn for -h/-?/-o/-n command line switches
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index e217e17..a139020 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -421,7 +421,8 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter(
const ::rtl::OUString
}
else if (aArg.toChar() == '-')
{
-bDeprecated = true;
+if ( aArg.getLength() 2 ) // -h, -o, -n, -? are still valid
+bDeprecated = true;
oArg = ::rtl::OUString(aArg.getStr()+1, aArg.getLength()-1);
}
else
commit 5371a528926cc257f84d9d36751b5447a80511fb
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 16:36:02 2012 +0100
fix switches (--) and typos
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index f7e4660..dd1cbfc 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -79,8 +79,8 @@ namespace desktop
--math \n\
--global \n\
--web \n\
--o\n\
--n\n;
+-o \n\
+-n \n;
const char *aCmdLineHelp_right =
keep startup bitmap minimized.\n\
no startup screen, no default document and no UI.\n\
@@ -117,21 +117,21 @@ namespace desktop
Specify an UNO connect-string to create an UNO acceptor through
which\n\
other programs can connect to access the API\n\
--unaccept=accept-string\n\
- Close an acceptor that was created with
-accept=accept-string\n\
- Use -unnaccept=all to close all open acceptors\n\
+ Close an acceptor that was created with
--accept=accept-string\n\
+ Use --unnaccept=all to close all open acceptors\n\
--infilter=filter\n\
Force an input filter type if possible\n\
- Eg. -infilter=\Calc Office Open XML\\n\
---convert-to output_file_extension[:output_filter_name] [-outdir
ouput_dir] files\n\
+ Eg. --infilter=\Calc Office Open XML\\n\
+--convert-to output_file_extension[:output_filter_name] [--outdir
output_dir] files\n\
Batch convert files.\n\
- If -outdir is not specified then current working dir is used as
output_dir.\n\
- Eg. -convert-to pdf *.doc\n\
- -convert-to pdf:writer_pdf_Export -outdir /home/user
*.doc\n\
---print-to-file [-printer-name printer_name] [-outdir ouput_dir]
files\n\
+ If --outdir is not specified then current working dir is used
as output_dir.\n\
+ Eg. --convert-to pdf *.doc\n\
+ --convert-to pdf:writer_pdf_Export --outdir /home/user
*.doc\n\
+--print-to-file [-printer-name printer_name] [--outdir output_dir]
files\n\
Batch print files to file.\n\
- If -outdir is not specified then current working dir is used as
output_dir.\n\
- Eg. -print-to-file *.doc\n\
- -print-to-file -printer-name nasty_lowres_printer -outdir
/home/user *.doc\n\
+ If --outdir is not specified then current working dir is used
as output_dir.\n\
+ Eg. --print-to-file *.doc\n\
+ --print-to-file --printer-name nasty_lowres_printer
--outdir /home/user *.doc\n\
\nRemaining arguments will be treated as filenames or URLs of
documents to open.\n\n;
void ReplaceStringHookProc( UniString rStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 370551f6e8785aac0375f56d72e6a66333ebfff3 Author: Eike Rathke er...@redhat.com Date: Mon Jan 9 17:02:47 2012 +0100 ./config_host.mk is to be sourced, not invoked diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 8744a38..2c7f976 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,7 @@ # create ID file for the whole LibO tree. run it in toplevel dir -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.11.patch libvisio/libvisio-0.0.12.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.11.patch | 20 libvisio/libvisio-0.0.12.patch | 20 libvisio/makefile.mk |6 +++--- ooo.lst.in |2 +- 4 files changed, 24 insertions(+), 24 deletions(-) New commits: commit debcba3cbde5a44f14f83fc2ee759e96b4431a94 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 9 16:53:01 2012 +0100 Uploading new release of libvisio (0.0.12) - Ability to parse and extract OLE objects embedded in Visio files - Fix a bug with overkeen path closing algorithm Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/libvisio/libvisio-0.0.11.patch b/libvisio/libvisio-0.0.11.patch deleted file mode 100644 index 91e9700..000 --- a/libvisio/libvisio-0.0.11.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.11/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.11/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch new file mode 100644 index 000..c9e626c --- /dev/null +++ b/libvisio/libvisio-0.0.12.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.12/src/lib/libvisio_utils.h misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa99223..a14fb8d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.11 -TARFILE_MD5=a8b25a0bf696fd126a08319d88998492 +TARFILE_NAME=libvisio-0.0.12 +TARFILE_MD5=053a35c244bf132f806e198ac4d960aa PATCH_FILES=\ -libvisio-0.0.11.patch +$(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index 9760dbf..710402c 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 +053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1245266ebc4cb228ff17eda8ac4bc0ff35a86f7d Author: Eike Rathke er...@redhat.com Date: Mon Jan 9 17:02:47 2012 +0100 ./config_host.mk is to be sourced, not invoked diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 8744a38..2c7f976 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,7 @@ # create ID file for the whole LibO tree. run it in toplevel dir -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nss/makefile.mk
nss/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ee79ba6a79fa7277b468bdd8918a88aafa6d5f7 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Jan 9 17:39:55 2012 +0100 use absolute path diff --git a/nss/makefile.mk b/nss/makefile.mk index 93cd3d7..4076025 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -150,7 +150,7 @@ OS_TARGET=WIN95 #To build nss one has to call make nss_build_all in #mozilla/security/nss -NSS_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss +NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) $(MOZILLABUILD)/msys/bin/bash -i \ -c cd $(NSS_BUILD_DIR) make nss_build_all ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source
sc/inc/dbdata.hxx|1 +
sc/inc/document.hxx |2 --
sc/source/core/data/documen3.cxx |8
sc/source/core/data/table2.cxx |3 ++-
sc/source/core/tool/dbdata.cxx | 17 -
5 files changed, 19 insertions(+), 12 deletions(-)
New commits:
commit d710f11d76cd8728980824db1518d4d20e649727
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 9 12:03:48 2012 -0500
fdo#44545: Skip filtered cells during auto-fill.
Regression from 3.4.5.
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 1aab271..cef02e1 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -213,6 +213,7 @@ public:
const_iterator end() const;
const ScDBData* findAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly) const;
const ScDBData* findByRange(const ScRange rRange) const;
+const ScDBData* findByTable(SCTAB nTab) const;
ScDBData* getByRange(const ScRange rRange);
void insert(ScDBData* p);
void erase(iterator itr);
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 83ad4a1..50bcd27 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -493,8 +493,6 @@ public:
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly = false);
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
-const ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
-
SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange rBlock,
rtl::OUString* pName=NULL ) const;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 63d926a..66973de 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -311,14 +311,6 @@ ScDBData* ScDocument::GetDBAtArea(SCTAB nTab, SCCOL nCol1,
SCROW nRow1, SCCOL nC
return NULL;
}
-const ScDBData* ScDocument::GetFilterDBAtTable(SCTAB nTab) const
-{
-if (pDBCollection)
-return pDBCollection-GetFilterDBAtTable(nTab);
-else
-return NULL;
-}
-
ScDPCollection* ScDocument::GetDPCollection()
{
if (!pDPCollection)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index d070bf7..f13ed5b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2653,7 +2653,8 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool
bShow)
bool ScTable::IsDataFiltered() const
{
bool bAnyQuery = false;
-const ScDBData* pDBData = pDocument-GetFilterDBAtTable(nTab);
+const ScDBCollection* pDBs = pDocument-GetDBCollection();
+const ScDBData* pDBData = pDBs-GetFilterDBAtTable(nTab);
if ( pDBData )
{
ScQueryParam aParam;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 3cc4146..9c5d03b 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -808,6 +808,13 @@ const ScDBData* ScDBCollection::AnonDBs::findByRange(const
ScRange rRange) cons
return itr == maDBs.end() ? NULL : (*itr);
}
+const ScDBData* ScDBCollection::AnonDBs::findByTable(SCTAB nTab) const
+{
+DBsType::const_iterator itr = find_if(
+maDBs.begin(), maDBs.end(), FindFilterDBByTable(nTab));
+return itr == maDBs.end() ? NULL : (*itr);
+}
+
ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange rRange)
{
const ScDBData* pData = findByRange(rRange);
@@ -972,7 +979,15 @@ const ScDBData* ScDBCollection::GetFilterDBAtTable(SCTAB
nTab) const
NamedDBs::DBsType::const_iterator itr = find_if(
maNamedDBs.begin(), maNamedDBs.end(), FindFilterDBByTable(nTab));
-return itr == maNamedDBs.end() ? NULL : (*itr);
+const ScDBData* pData = itr == maNamedDBs.end() ? NULL : (*itr);
+if (pData)
+return pData;
+
+pData = pDoc-GetAnonymousDBData(nTab);
+if (pData)
+return pData;
+
+return getAnonDBs().findByTable(nTab);
}
void ScDBCollection::DeleteOnTab( SCTAB nTab )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dbdata.hxx|1 +
sc/inc/document.hxx |2 --
sc/source/core/data/documen3.cxx |8
sc/source/core/data/table2.cxx |3 ++-
sc/source/core/tool/dbdata.cxx | 17 -
5 files changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 0d6e8c35133c10b3b4e0ef69bbca51ac7506b5d2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 9 12:03:48 2012 -0500
fdo#44545: Skip filtered cells during auto-fill.
Regression from 3.4.5.
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 1aab271..cef02e1 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -213,6 +213,7 @@ public:
const_iterator end() const;
const ScDBData* findAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly) const;
const ScDBData* findByRange(const ScRange rRange) const;
+const ScDBData* findByTable(SCTAB nTab) const;
ScDBData* getByRange(const ScRange rRange);
void insert(ScDBData* p);
void erase(iterator itr);
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8e41fea..2d232e7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -492,8 +492,6 @@ public:
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly = false);
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
-const ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
-
SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange rBlock,
rtl::OUString* pName=NULL ) const;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 63d926a..66973de 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -311,14 +311,6 @@ ScDBData* ScDocument::GetDBAtArea(SCTAB nTab, SCCOL nCol1,
SCROW nRow1, SCCOL nC
return NULL;
}
-const ScDBData* ScDocument::GetFilterDBAtTable(SCTAB nTab) const
-{
-if (pDBCollection)
-return pDBCollection-GetFilterDBAtTable(nTab);
-else
-return NULL;
-}
-
ScDPCollection* ScDocument::GetDPCollection()
{
if (!pDPCollection)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 2b5fbed..2c40a5c 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2652,7 +2652,8 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool
bShow)
bool ScTable::IsDataFiltered() const
{
bool bAnyQuery = false;
-const ScDBData* pDBData = pDocument-GetFilterDBAtTable(nTab);
+const ScDBCollection* pDBs = pDocument-GetDBCollection();
+const ScDBData* pDBData = pDBs-GetFilterDBAtTable(nTab);
if ( pDBData )
{
ScQueryParam aParam;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 288fbac..c612d32 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -808,6 +808,13 @@ const ScDBData* ScDBCollection::AnonDBs::findByRange(const
ScRange rRange) cons
return itr == maDBs.end() ? NULL : (*itr);
}
+const ScDBData* ScDBCollection::AnonDBs::findByTable(SCTAB nTab) const
+{
+DBsType::const_iterator itr = find_if(
+maDBs.begin(), maDBs.end(), FindFilterDBByTable(nTab));
+return itr == maDBs.end() ? NULL : (*itr);
+}
+
ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange rRange)
{
const ScDBData* pData = findByRange(rRange);
@@ -972,7 +979,15 @@ const ScDBData* ScDBCollection::GetFilterDBAtTable(SCTAB
nTab) const
NamedDBs::DBsType::const_iterator itr = find_if(
maNamedDBs.begin(), maNamedDBs.end(), FindFilterDBByTable(nTab));
-return itr == maNamedDBs.end() ? NULL : (*itr);
+const ScDBData* pData = itr == maNamedDBs.end() ? NULL : (*itr);
+if (pData)
+return pData;
+
+pData = pDoc-GetAnonymousDBData(nTab);
+if (pData)
+return pData;
+
+return getAnonDBs().findByTable(nTab);
}
void ScDBCollection::DeleteOnTab( SCTAB nTab )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/frmedt/fefly1.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 3d3584237424b8efefdb0579e131892e1ddf00a9 Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Mon Jan 9 18:15:11 2012 +0100 fdo#36681: refresh the layout after inserting a picture diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 97c6a5d..473f6f3 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -846,6 +846,12 @@ void SwFEShell::Insert( const String rGrfName, const String rFltName, const Point aPt( GetCrsrDocPos() ); SwFlyFrm* pFrm = pFmt-GetFrm( aPt ); +// Invalidate the content and layout to refresh the picture anchoring +// properly +SwPageFrm* pPageFrm = pFrm-FindPageFrmOfAnchor(); +pPageFrm-InvalidateFlyLayout(); +pPageFrm-InvalidateCntnt(); + if( pFrm ) SelectFlyFrm( *pFrm, sal_True ); else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/frmedt/fefly1.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 4463a523ae78a9eff1776668825ec6be944c1574 Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Mon Jan 9 18:15:11 2012 +0100 fdo#36681: refresh the layout after inserting a picture diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 97c6a5d..473f6f3 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -846,6 +846,12 @@ void SwFEShell::Insert( const String rGrfName, const String rFltName, const Point aPt( GetCrsrDocPos() ); SwFlyFrm* pFrm = pFmt-GetFrm( aPt ); +// Invalidate the content and layout to refresh the picture anchoring +// properly +SwPageFrm* pPageFrm = pFrm-FindPageFrmOfAnchor(); +pPageFrm-InvalidateFlyLayout(); +pPageFrm-InvalidateCntnt(); + if( pFrm ) SelectFlyFrm( *pFrm, sal_True ); else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/i18n_cb.hxx |3 --
vcl/inc/unx/i18n_ic.hxx |1
vcl/inc/unx/saldisp.hxx |2 -
vcl/unx/generic/app/i18n_cb.cxx | 39
vcl/unx/generic/app/i18n_ic.cxx | 42 ---
vcl/unx/generic/app/saldisp.cxx | 54
6 files changed, 141 deletions(-)
New commits:
commit 22d05186ed7bf0314b43e1db09eb8706d09c6da1
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Dec 17 19:29:49 2011 +0100
callcatcher: remove unused SalColormap methods
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index ded2d1c..8fd0507 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -163,7 +163,6 @@ public:
SalColormap( const SalDisplay* pSalDisplay,
Colormap hColormap,
intnScreen );
-SalColormap( const BitmapPalette rpPalette );
SalColormap( sal_uInt16 nDepth );
SalColormap();
~SalColormap();
@@ -189,7 +188,6 @@ public:
int b ) const;
Pixel GetPixel( SalColor nColor ) const;
SalColorGetColor( Pixel nPixel ) const;
-voidSetPalette( const BitmapPalette rPalette );
};
// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 3c53b7b..75882cc 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2777,30 +2777,6 @@ SalColormap::SalColormap( const SalDisplay *pDisplay,
Colormap hColormap, int nS
}
}
-// PseudoColor
-SalColormap::SalColormap( const BitmapPalette rPalette )
-: m_pDisplay( GetGenericData()-GetSalDisplay() ),
- m_hColormap( None ),
- m_nWhitePixel( SALCOLOR_NONE ),
- m_nBlackPixel( SALCOLOR_NONE ),
- m_nUsed( rPalette.GetEntryCount() ),
- m_nScreen( GetGenericData()-GetSalDisplay()-GetDefaultScreenNumber() )
-{
-m_aPalette = std::vectorSalColor(m_nUsed);
-
-for( unsigned int i = 0; i m_nUsed; i++ )
-{
-const BitmapColor rColor = rPalette[i];
-m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
-if( (m_nBlackPixel == SALCOLOR_NONE) (SALCOLOR_BLACK ==
m_aPalette[i]) )
-m_nBlackPixel = i;
-else if( (m_nWhitePixel == SALCOLOR_NONE) (SALCOLOR_WHITE ==
m_aPalette[i]) )
-m_nWhitePixel = i;
-}
-}
-
// MonoChrome
SalColormap::SalColormap()
: m_pDisplay( GetGenericData()-GetSalDisplay() ),
@@ -2913,36 +2889,6 @@ SalColormap::~SalColormap()
#endif
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalColormap::SetPalette( const BitmapPalette rPalette )
-{
-if( this != GetGenericData()-GetSalDisplay()-GetColormap(m_nScreen) )
-{
-m_nBlackPixel = SALCOLOR_NONE;
-m_nWhitePixel = SALCOLOR_NONE;
-}
-
-if( rPalette.GetEntryCount() m_nUsed )
-{
-m_nBlackPixel = SALCOLOR_NONE;
-m_nWhitePixel = SALCOLOR_NONE;
-m_nUsed = rPalette.GetEntryCount();
-m_aPalette = std::vectorSalColor(m_nUsed);
-}
-
-for( int i = 0; i rPalette.GetEntryCount(); i++ )
-{
-const BitmapColor rColor = rPalette[i];
-m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
-if( (m_nBlackPixel == SALCOLOR_NONE) (SALCOLOR_BLACK ==
m_aPalette[i]) )
-m_nBlackPixel = i;
-else if( (m_nWhitePixel == SALCOLOR_NONE) (SALCOLOR_WHITE ==
m_aPalette[i]) )
-m_nWhitePixel = i;
-}
-}
-
void SalColormap::GetPalette()
{
Pixel i;
commit f072008981f77e8e28a9f088b4c3604b860af5f8
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Dec 17 19:27:21 2011 +0100
callcatcher: clean up vcl i18n
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 7b16a7d..e00dc5f 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -35,9 +35,6 @@
extern C {
#endif
-// for iiimp / ml input
-int CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data);
-
// xim callbacks
void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
int PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a9c5ab..5e427f9 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -82,7 +82,6 @@ public:
void Map( SalFrame *pFrame );
void Unmap( SalFrame* pFrame );
-void SetPreeditState(Bool aPreeditState);
void SetLanguage(LanguageType aInputLanguage);
SalI18N_InputContext( SalFrame *aFrame );
diff --git
[Libreoffice-commits] .: 3 commits - canvas/source slideshow/source
canvas/source/directx/dx_impltools.cxx |4 - canvas/source/tools/spriteredrawmanager.cxx | 31 +-- canvas/source/vcl/textlayout.cxx |4 - slideshow/source/engine/animationnodes/basecontainernode.cxx |3 - slideshow/source/engine/eventmultiplexer.cxx |4 - slideshow/source/engine/tools.cxx|2 6 files changed, 23 insertions(+), 25 deletions(-) New commits: commit 53ec7e3b2c1e0fdcd72c30a36ede77319bab4969 Author: Thorsten Behrens tbehr...@suse.com Date: Mon Jan 9 18:35:27 2012 +0100 Avoid pointless const_cast, use getConstArray in all cases. Another code-review follow-up fix from fdo#44533 - don't use Sequence::getArray, that tends to create a new copy everytime you call. diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 946a9b2..63bcabe 100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -452,8 +452,8 @@ namespace dxcanvas // TODO(F1): Closed/open polygons // convert from RealPoint2D array to Gdiplus::PointF array -::std::transform( const_cast uno::Sequence geometry::RealPoint2D (points[nCurrPoly]).getArray(), - const_cast uno::Sequence geometry::RealPoint2D (points[nCurrPoly]).getArray()+nCurrSize, +::std::transform( points[nCurrPoly].getConstArray(), + points[nCurrPoly].getConstArray()+nCurrSize, aPoints.begin(), implGdiPlusPointFromRealPoint2D ); diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 89711e5..4dd036f 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -465,8 +465,8 @@ namespace vclcanvas renderState); // fill integer offsets -::std::transform( const_cast uno::Sequence double (inputOffsets).getConstArray(), - const_cast uno::Sequence double (inputOffsets).getConstArray()+inputOffsets.getLength(), +::std::transform( inputOffsets.getConstArray(), + inputOffsets.getConstArray()+inputOffsets.getLength(), outputOffsets, OffsetTransformer( aMatrix ) ); } commit c85142eb63c61de68aa7dbb10b2bcb8b48b870f9 Author: Thorsten Behrens tbehr...@suse.com Date: Mon Jan 9 18:04:58 2012 +0100 Fix more incorrect iterator re-use. Follow-up fix for 540963d879296ef81f883305057e63465b2ff586 std::algos use iterator arguments by value, and may change them. diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index 25accbe..2af5b34 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -412,16 +412,11 @@ namespace canvas if( nNumSprites 3 || nNumSprites 1 ) return false; -const SpriteConnectedRanges::ComponentListType::const_iterator aBegin( -rUpdateArea.maComponentList.begin() ); -const SpriteConnectedRanges::ComponentListType::const_iterator aEnd( -rUpdateArea.maComponentList.end() ); - // now, calc the _true_ update area, by merging all sprite's // true update areas into one rectangle -::basegfx::B2DRange aTrueArea( aBegin-second.getUpdateArea() ); -::std::for_each( aBegin, - aEnd, +::basegfx::B2DRange aTrueArea( rUpdateArea.maComponentList.begin()-second.getUpdateArea() ); +::std::for_each( rUpdateArea.maComponentList.begin(), + rUpdateArea.maComponentList.end(), ::boost::bind( (void (basegfx::B2DRange::*)(const basegfx::B2DRange))( basegfx::B2DRange::expand), aTrueArea, @@ -429,9 +424,12 @@ namespace canvas ::boost::bind( ::o3tl::select2ndAreaComponent(), _1 ) ) ) ); +const SpriteConnectedRanges::ComponentListType::const_iterator aEnd( +rUpdateArea.maComponentList.end() ); + // and check whether _any_ of the sprites tells that its area // update will not be opaque. -return (::std::find_if( aBegin, +return (::std::find_if( rUpdateArea.maComponentList.begin(), aEnd, ::boost::bind( SpriteRedrawManager::isAreaUpdateNotOpaque, this, diff --git
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 130
+-
1 file changed, 67 insertions(+), 63 deletions(-)
New commits:
commit ce123a5c6fedb7343428033d1cd82d97aa2cef34
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Jan 9 18:48:39 2012 +0100
Fix totally busted whitespace in slideshow module.
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index afe3a95..c76527f 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -26,7 +26,6 @@
*
/
-
#include canvas/debug.hxx
#include tools/diagnose_ex.h
@@ -147,54 +146,54 @@ public:
rEventMultiplexer ),
maTransitions(),
mbSuccess( false ),
-mnTransitionType( nTransitionType ),
-mnTransitionSubType( nTransitionSubType ),
-mxFactory( xFactory )
+mnTransitionType( nTransitionType ),
+mnTransitionSubType( nTransitionSubType ),
+mxFactory( xFactory )
{
// create one transition per view
UnoViewVector::const_iterator aCurrView (rViewContainer.begin());
const UnoViewVector::const_iterator aEnd(rViewContainer.end());
while( aCurrView != aEnd )
{
-if(! addTransition( *aCurrView ) )
-return;
+if(! addTransition( *aCurrView ) )
+return;
ENSURE_OR_THROW(maTransitions.back()
maTransitions.back()-mxTransition.is(),
Failed to create plugin transition);
++aCurrView;
}
-mbSuccess = true;
+mbSuccess = true;
}
~PluginSlideChange()
{
-mxFactory.clear();
+mxFactory.clear();
::std::vector TransitionViewPair* ::const_iterator aCurrView
(maTransitions.begin());
::std::vector TransitionViewPair* ::const_iterator
aEnd(maTransitions.end());
while( aCurrView != aEnd )
{
-delete (*aCurrView);
+delete (*aCurrView);
++aCurrView;
-}
-maTransitions.clear();
+}
+maTransitions.clear();
}
bool addTransition( const UnoViewSharedPtr rView )
{
-uno::Referencepresentation::XTransition rTransition =
mxFactory-createTransition(
-mnTransitionType,
-mnTransitionSubType,
-rView-getUnoView(),
-getLeavingBitmap(ViewEntry(rView))-getXBitmap(),
-getEnteringBitmap(ViewEntry(rView))-getXBitmap() );
-
-if( rTransition.is() )
-maTransitions.push_back( new TransitionViewPair( rTransition, rView )
);
-else
-return false;
+uno::Referencepresentation::XTransition rTransition =
mxFactory-createTransition(
+mnTransitionType,
+mnTransitionSubType,
+rView-getUnoView(),
+getLeavingBitmap(ViewEntry(rView))-getXBitmap(),
+getEnteringBitmap(ViewEntry(rView))-getXBitmap() );
+
+if( rTransition.is() )
+maTransitions.push_back( new TransitionViewPair( rTransition,
rView ) );
+else
+return false;
-return true;
+return true;
}
virtual bool operator()( double t )
@@ -214,83 +213,87 @@ public:
// ViewEventHandler
virtual void viewAdded( const UnoViewSharedPtr rView )
{
-OSL_TRACE(PluginSlideChange viewAdded);
-SlideChangeBase::viewAdded( rView );
+OSL_TRACE(PluginSlideChange viewAdded);
+SlideChangeBase::viewAdded( rView );
::std::vector TransitionViewPair* ::const_iterator aCurrView
(maTransitions.begin());
::std::vector TransitionViewPair* ::const_iterator
aEnd(maTransitions.end());
-bool bKnown = false;
+bool bKnown = false;
while( aCurrView != aEnd )
{
-if( (*aCurrView)-mpView == rView ) {
-bKnown = true;
-break;
-}
+if( (*aCurrView)-mpView == rView )
+{
+bKnown = true;
+break;
+}
++aCurrView;
-}
-
-if( !bKnown ) {
-OSL_TRACE(need to be added);
+}
-addTransition( rView );
-}
+if( !bKnown )
+{
+OSL_TRACE(need to be added);
+addTransition( rView );
+}
}
virtual void viewRemoved( const UnoViewSharedPtr rView )
{
-OSL_TRACE(PluginSlideChange viewRemoved);
-SlideChangeBase::viewRemoved( rView );
+OSL_TRACE(PluginSlideChange viewRemoved);
+SlideChangeBase::viewRemoved( rView );
::std::vector TransitionViewPair* ::iterator aCurrView
(maTransitions.begin());
::std::vector TransitionViewPair* ::const_iterator
aEnd(maTransitions.end());
while( aCurrView != aEnd )
{
-if(
[Libreoffice-commits] .: extensions/source
extensions/source/plugin/aqua/sysplug.mm | 72 +++
extensions/source/plugin/base/nfuncs.cxx | 31 +---
extensions/source/plugin/base/xplugin.cxx|4 -
extensions/source/plugin/inc/plugin/aqua/sysplug.hxx | 27 ++-
extensions/source/plugin/inc/plugin/impl.hxx | 29 +--
extensions/source/plugin/unx/sysplug.cxx |6 +
extensions/source/plugin/win/sysplug.cxx |4 +
7 files changed, 117 insertions(+), 56 deletions(-)
New commits:
commit 8f468159691f051ea2fa5d28486b989ecc75d69a
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 9 18:47:31 2012 +0100
extensions: plugin: try to fix Mac build:
Move everything that requires ObjectiveC stuff to the ObjC++ files in
the aqua subdirectory, where it belongs.
diff --git a/extensions/source/plugin/aqua/sysplug.mm
b/extensions/source/plugin/aqua/sysplug.mm
index 415ca93..8db2dce 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -30,6 +30,11 @@
#include sys/types.h
#include signal.h
#include sys/wait.h
+
+#include premac.h
+#include Cocoa/Cocoa.h
+#include postmac.h
+
#include osl/thread.h
#include plugin/impl.hxx
@@ -51,6 +56,73 @@ void TRACEN( char const * s, long n );
#define TRACEN(x,n)
#endif
+
+struct SysPlugData
+{
+MacPluginComm::NP_CGContext m_aCGContext;
+NP_Port m_aNPPort;
+NSView* m_pParentView;
+NSView* m_pPlugView;
+int m_nDrawingModel;
+NSPoint m_aLastPlugViewOrigin;
+boolm_bSetWindowOnDraw;
+SysPlugData()
+{
+memset( this, 0, sizeof(*this) );
+}
+};
+
+::boost::shared_ptrSysPlugData CreateSysPlugData()
+{
+return ::boost::shared_ptrSysPlugData(new SysPlugData);
+}
+
+void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData* pEnvData)
+{
+m_pSysPlugData.m_pParentView = pEnvData-pView;
+}
+
+extern C {
+
+void /*SAL_CALL NP_LOADDS*/ NPN_ForceRedraw_Impl(NPP instance)
+{
+TRACE( NPN_ForceRedraw_Impl );
+XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance );
+if( pImpl )
+{
+SysPlugData rPlugData( pImpl-getSysPlugData() );
+if( rPlugData.m_pPlugView )
+[rPlugData.m_pPlugView setNeedsDisplay: YES];
+}
+}
+
+NPError /*SAL_CALL NP_LOADDS*/ NPN_SetValue_Impl( NPP instance,
+ NPPVariable variable,
+ void* value )
+{
+TRACE( NPN_SetValue_Impl );
+switch( variable )
+{
+case (NPPVariable)1000: // NPNVpluginDrawingModel
+{
+// ugly, but that's the way we need to do it
+int nDrawingModel = (int)value;
+
+TRACEN( drawing model: , nDrawingModel );
+XPlugin_Impl* pImpl =
+XPluginManager_Impl::getXPluginFromNPP( instance );
+if (pImpl)
+pImpl-getSysPlugData().m_nDrawingModel = nDrawingModel;
+}
+break;
+default:
+break;
+}
+return NPERR_NO_ERROR;
+}
+
+} // extern C
+
struct FakeEventRecord : public EventRecord
{
FakeEventRecord()
diff --git a/extensions/source/plugin/base/nfuncs.cxx
b/extensions/source/plugin/base/nfuncs.cxx
index d06c5b8..69b73f5 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -600,28 +600,11 @@ NPError SAL_CALL NP_LOADDS NPN_SetValue( NPP instance,
{
NPError nError = NPERR_NO_ERROR;
TRACEN( NPN_SetValue , variable );
-switch( variable )
-{
#ifdef QUARTZ
-case (NPPVariable)1000: // NPNVpluginDrawingModel
-{
-int nDrawingModel = (int)value; // ugly, but that's the way we need to
do it
-
-TRACEN( drawing model: , nDrawingModel );
-
-XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance
);
-if( pImpl )
-pImpl-getSysPlugData().m_nDrawingModel = nDrawingModel;
-}
-break;
-#endif
-case NPPVpluginNameString: // make the windows compiler happy, it needs at
least one case statement
-break;
-default:
-break;
-}
-#ifndef QUARTZ
+NPN_SetValue_Impl(instance, variable, value);
+#else
(void)instance;
+(void)variable;
(void)value;
#endif
return nError;
@@ -653,13 +636,7 @@ void SAL_CALL NP_LOADDS NPN_ForceRedraw(NPP instance)
{
TRACE( NPN_ForceRedraw );
#ifdef QUARTZ
-XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance );
-if( pImpl )
-{
-SysPlugData rPlugData( pImpl-getSysPlugData() );
-if( rPlugData.m_pPlugView )
-[rPlugData.m_pPlugView setNeedsDisplay: YES];
-}
+NPN_ForceRedraw_Impl(instance);
#else
(void)instance;
#endif
diff --git
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/attributemap.cxx |2 +-
slideshow/source/engine/shapes/shapeimporter.cxx |4 ++--
slideshow/source/engine/transitions/transitionfactorytab.cxx |7 +++
3 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 9c59cd15b150638c845bbc275b9b04460afc23bd
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Jan 9 18:56:42 2012 +0100
Use SAL_N_ELEMENTS in slideshow where possible.
diff --git a/slideshow/source/engine/attributemap.cxx
b/slideshow/source/engine/attributemap.cxx
index beb403a..006a830 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -79,7 +79,7 @@ namespace slideshow
};
static AnimateAttributeMap aMap( lcl_attributeMap,
-
sizeof(lcl_attributeMap)/sizeof(*lcl_attributeMap),
+ SAL_N_ELEMENTS(lcl_attributeMap),
false );
AttributeType eAttributeType = ATTRIBUTE_INVALID;
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx
b/slideshow/source/engine/shapes/shapeimporter.cxx
index 8294643..f9df63b 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -311,7 +311,7 @@ ShapeSharedPtr ShapeImporter::createShape(
RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.sfx2.PluginObject )),
aPropertyValues,
-
sizeof(aPropertyValues)/sizeof(*aPropertyValues),
+ SAL_N_ELEMENTS(aPropertyValues),
mrContext );
}
else if( shapeType.equalsAsciiL(
@@ -334,7 +334,7 @@ ShapeSharedPtr ShapeImporter::createShape(
RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.comp.sfx2.AppletObject )),
aPropertyValues,
-
sizeof(aPropertyValues)/sizeof(*aPropertyValues),
+ SAL_N_ELEMENTS(aPropertyValues),
mrContext );
}
else if( shapeType.equalsAsciiL(
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx
b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 2ceed34..f5cea7b 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -2120,9 +2120,8 @@ static const TransitionInfo lcl_transitionInfo[] =
const TransitionInfo* TransitionFactory::getTransitionInfo(
sal_Int16 nTransitionType, sal_Int16 nTransitionSubType )
{
-static const ::std::size_t lcl_tableSize(
-sizeof(lcl_transitionInfo)/sizeof(TransitionInfo) );
-static const TransitionInfo* pTableEnd = lcl_transitionInfo+lcl_tableSize;
+static const TransitionInfo* pTableEnd = lcl_transitionInfo+
+SAL_N_ELEMENTS(lcl_transitionInfo);
const TransitionInfo* pRes = ::std::find_if(
lcl_transitionInfo, pTableEnd,
@@ -2137,7 +2136,7 @@ const TransitionInfo*
TransitionFactory::getTransitionInfo(
const TransitionInfo* TransitionFactory::getRandomTransitionInfo()
{
return lcl_transitionInfo + getRandomOrdinal(
-sizeof(lcl_transitionInfo) / sizeof(TransitionInfo)
+SAL_N_ELEMENTS(lcl_transitionInfo)
- 1 /* exclude random transition at end of table */ );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/factory/cf_service.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit ea1ce3c63044394b1e4387808231d535a4118f4e Author: Thorsten Behrens tbehr...@suse.com Date: Mon Jan 9 18:59:51 2012 +0100 Kill unused macro in canvas. diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 8127bfd..8ede9a9 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -50,8 +50,6 @@ #include algorithm #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) -#define ARLEN(x) (sizeof (x) / sizeof *(x)) - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - cui/source desktop/source
cui/source/dialogs/about.src |4 ++--
desktop/source/app/app.cxx |2 +-
desktop/source/app/cmdlineargs.cxx | 14 --
desktop/source/app/cmdlineargs.hxx |3 ---
4 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 1eafe2bb4cdefaa4ea66ede89a513d175874e779
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 18:57:17 2012 +0100
bump LibreOffice copyright year to 2012
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 8db6636..37e5f4d 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -78,11 +78,11 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_COPYRIGHT
{
-Text[ en-US ] = LibreOffice is copyright © 2000, 2011 LibreOffice
contributors and/or their affiliates. All rights reserved.;
+Text[ en-US ] = LibreOffice is copyright © 2000, 2012 LibreOffice
contributors and/or their affiliates. All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_DERIVED
{
-Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates.
All rights reserved.;
+Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates.
All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
{
commit ecc0edad478f84d2b26d4a3beefdf485375e807c
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 17:55:29 2012 +0100
remove deprecated --plugin command line switch
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 9602f7c..6a5d58a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -446,10 +446,6 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter(
const ::rtl::OUString
{
SetBoolParam_Impl( CMD_BOOLPARAM_NODEFAULT, sal_True );
}
-else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( plugin )) ==
sal_True )
-{
-SetBoolParam_Impl( CMD_BOOLPARAM_PLUGIN, sal_True );
-}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( server )) ==
sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_SERVER, sal_True );
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index 62d00e0..f79efea 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -44,7 +44,6 @@ class CommandLineArgs
CMD_BOOLPARAM_MINIMIZED = 0,
CMD_BOOLPARAM_INVISIBLE,
CMD_BOOLPARAM_NORESTORE,
-CMD_BOOLPARAM_PLUGIN,
CMD_BOOLPARAM_SERVER,
CMD_BOOLPARAM_HEADLESS,
CMD_BOOLPARAM_QUICKSTART,
commit 11abb04ab0dc926469e0eb8a78cb865d5e75b922
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 17:47:55 2012 +0100
remove deprecated --bean command line switch
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 50dc759..855418a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2660,7 +2660,7 @@ void Desktop::OpenClients()
if ( xList-hasElements() || rArgs.IsServer() )
return;
-if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || rArgs.IsBean() ||
Application::AnyInput( VCL_INPUT_APPEVENT ) )
+if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || Application::AnyInput(
VCL_INPUT_APPEVENT ) )
// soffice was started as tray icon ...
return;
{
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index a139020..9602f7c 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -446,10 +446,6 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter(
const ::rtl::OUString
{
SetBoolParam_Impl( CMD_BOOLPARAM_NODEFAULT, sal_True );
}
-else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( bean )) ==
sal_True )
-{
-SetBoolParam_Impl( CMD_BOOLPARAM_BEAN, sal_True );
-}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( plugin )) ==
sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_PLUGIN, sal_True );
@@ -718,12 +714,6 @@ sal_Bool CommandLineArgs::IsNoDefault() const
return m_aBoolParams[ CMD_BOOLPARAM_NODEFAULT ];
}
-sal_Bool CommandLineArgs::IsBean() const
-{
-osl::MutexGuard aMutexGuard( m_aMutex );
-return m_aBoolParams[ CMD_BOOLPARAM_BEAN ];
-}
-
sal_Bool CommandLineArgs::IsServer() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index 9eb554c..62d00e0 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -44,7 +44,6 @@ class CommandLineArgs
CMD_BOOLPARAM_MINIMIZED = 0,
CMD_BOOLPARAM_INVISIBLE,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/dialogs/about.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d4f161ed509071ee01798f3bf2d686826089
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 18:57:17 2012 +0100
bump LibreOffice copyright year to 2012
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 8db6636..37e5f4d 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -78,11 +78,11 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_COPYRIGHT
{
-Text[ en-US ] = LibreOffice is copyright © 2000, 2011 LibreOffice
contributors and/or their affiliates. All rights reserved.;
+Text[ en-US ] = LibreOffice is copyright © 2000, 2012 LibreOffice
contributors and/or their affiliates. All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_DERIVED
{
-Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates.
All rights reserved.;
+Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates.
All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 3dbe4c18d0df62fa28fa69052ffb37c90af077f2
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jan 9 19:52:09 2012 +0100
Related: fdo#42151 implement cell text flow support
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6c8e8d7..143bd23 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1612,6 +1612,22 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
return 0;
}
+// Cell Text Flow
+switch (nKeyword)
+{
+case RTF_CLTXLRTB: nParam = 0; break;
+case RTF_CLTXTBRL: nParam = 1; break;
+case RTF_CLTXBTLR: nParam = 3; break;
+case RTF_CLTXLRTBV: nParam = 4; break;
+case RTF_CLTXTBRLV: nParam = 5; break;
+default: break;
+}
+if (nParam = 0)
+{
+RTFValue::Pointer_t pValue(new RTFValue(nParam));
+
m_aStates.top().aTableCellSprms-push_back(make_pair(NS_ooxml::LN_CT_TcPrBase_textDirection,
pValue));
+}
+
// Trivial paragraph flags
switch (nKeyword)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/alienwarn.cxx | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) New commits: commit 2d6441cfc4248a8c8d9aaa3a9dcd4b608b77b858 Author: Andras Timar ati...@suse.com Date: Mon Jan 9 21:18:38 2012 +0100 autoresize 'Use ODF format' button, too diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 6acf107..e913c88 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -155,11 +155,6 @@ void SfxAlienWarningDialog::InitSize() (*pCurrent)-SetPosPixel( aNewPos ); } -// new size of the dialog -aNewSize = GetSizePixel(); -aNewSize.Height() -= nDelta; -SetSizePixel( aNewSize ); - // recalculate the size and position of the buttons m_aMoreInfoBtn.Hide(); nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() ); @@ -170,6 +165,17 @@ void SfxAlienWarningDialog::InitSize() Point aPos = m_aSaveODFBtn.GetPosPixel(); aPos.X() = AW_COL_3 + nTxtW; m_aSaveODFBtn.SetPosPixel( aPos ); +nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() ); +nTxtW += IMPL_EXTRA_BUTTON_WIDTH; +aNewSize = m_aSaveODFBtn.GetSizePixel(); +aNewSize.Width() = nTxtW; +m_aSaveODFBtn.SetSizePixel( aNewSize ); + +// new size of the dialog +aNewSize = GetSizePixel(); +aNewSize.Height() -= nDelta; +SetSizePixel( aNewSize ); + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/dialog/alienwarn.cxx | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) New commits: commit 2e0ec77cd6bbfe599d63f3a67218c1cf09bb19a6 Author: Andras Timar ati...@suse.com Date: Mon Jan 9 21:18:38 2012 +0100 autoresize 'Use ODF format' button, too diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 6acf107..e913c88 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -155,11 +155,6 @@ void SfxAlienWarningDialog::InitSize() (*pCurrent)-SetPosPixel( aNewPos ); } -// new size of the dialog -aNewSize = GetSizePixel(); -aNewSize.Height() -= nDelta; -SetSizePixel( aNewSize ); - // recalculate the size and position of the buttons m_aMoreInfoBtn.Hide(); nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() ); @@ -170,6 +165,17 @@ void SfxAlienWarningDialog::InitSize() Point aPos = m_aSaveODFBtn.GetPosPixel(); aPos.X() = AW_COL_3 + nTxtW; m_aSaveODFBtn.SetPosPixel( aPos ); +nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() ); +nTxtW += IMPL_EXTRA_BUTTON_WIDTH; +aNewSize = m_aSaveODFBtn.GetSizePixel(); +aNewSize.Width() = nTxtW; +m_aSaveODFBtn.SetSizePixel( aNewSize ); + +// new size of the dialog +aNewSize = GetSizePixel(); +aNewSize.Height() -= nDelta; +SetSizePixel( aNewSize ); + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/alienwarn.src |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 47f41564b202e095d6b61df72487cd63d85e5ca8
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sun Jan 8 14:07:54 2012 +0100
Make the title of foreign file format warning translatable
Also, change the contained text slightly.
Thanks to William Gathoye for noticing and producing a first patch
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index 0ba3f59..98d3372 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -38,7 +38,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
Moveable = TRUE;
SVLook = TRUE;
-Text = Save;
+Text [ en-US ] = Confirm File Format;
FixedImage FI_QUERY
{
@@ -51,7 +51,6 @@ ModalDialog RID_DLG_ALIEN_WARNING
Size = MAP_APPFONT(
DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT,
INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT );
NoLabel = TRUE;
Wordbreak = TRUE;
-Text [ en-US-old ] = This document may contain formatting or content
that cannot be saved in the %FORMATNAME file format. Do you want to save the
document in this format anyway?\n\n- Click 'Yes' to save in %FORMATNAME file
format.\n- Click 'No' to use the latest OpenDocument file format and be sure
all formatting and content is saved correctly.;
Text [ en-US ] = This document may contain formatting or content that
cannot be saved in the currently selected file format \%FORMATNAME\.\n\nUse
the default ODF file format to be sure that the document is saved correctly.;
};
OKButton PB_NO
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/dialog/alienwarn.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a62d7628f35c259dc3688f326b5ad31d674ab33
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 21:27:46 2012 +0100
revert text change in alienwarn.src
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index bd72a23..98d3372 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -51,7 +51,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
Size = MAP_APPFONT(
DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT,
INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT );
NoLabel = TRUE;
Wordbreak = TRUE;
-Text [ en-US ] = This document may contain content that cannot be
saved in the currently selected file format \%FORMATNAME\. Do you really want
to use \%FORMATNAME\?\n\nTo be sure the document is saved correctly, use the
ODF format.;
+Text [ en-US ] = This document may contain formatting or content that
cannot be saved in the currently selected file format \%FORMATNAME\.\n\nUse
the default ODF file format to be sure that the document is saved correctly.;
};
OKButton PB_NO
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svl/source unotools/inc
svl/source/misc/restrictedpaths.cxx |4 +-
unotools/inc/unotools/localfilehelper.hxx | 50 ++
2 files changed, 26 insertions(+), 28 deletions(-)
New commits:
commit 58ef08f5e1336acbcfcb9f6f7a6449a0eae518a7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 20:21:26 2012 +
toLower-lowercase
diff --git a/svl/source/misc/restrictedpaths.cxx
b/svl/source/misc/restrictedpaths.cxx
index d743247..ffdcdc6 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -105,7 +105,7 @@ namespace svt
#ifdef WNT
// on windows, assume that the relevant file systems are case
insensitive,
// thus normalize the URL
-m_sCheckURL = m_aSysLocale.GetCharClass().toLower( m_sCheckURL, 0,
m_sCheckURL.Len() );
+m_sCheckURL = m_aSysLocale.GetCharClass().lowercase( m_sCheckURL,
0, m_sCheckURL.Len() );
#endif
}
@@ -114,7 +114,7 @@ namespace svt
#ifdef WNT
// on windows, assume that the relevant file systems are case
insensitive,
// thus normalize the URL
-String sApprovedURL( m_aSysLocale.GetCharClass().toLower(
_rApprovedURL, 0, _rApprovedURL.Len() ) );
+String sApprovedURL( m_aSysLocale.GetCharClass().lowercase(
_rApprovedURL, 0, _rApprovedURL.Len() ) );
#else
String sApprovedURL( _rApprovedURL );
#endif
commit 4e83af0dc7d41c458f9d971342c62103fad51d0f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 15:31:21 2012 +
make indent sane
diff --git a/unotools/inc/unotools/localfilehelper.hxx
b/unotools/inc/unotools/localfilehelper.hxx
index 634c7de..ebccc43 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.hxx
@@ -36,35 +36,33 @@
namespace utl
{
+class UNOTOOLS_DLLPUBLIC LocalFileHelper
+{
+public:
+/**
+Converts a physical file name into a UCB compatible URL ( if
possible ).
+If no UCP is available for the local file system, sal_False and an
empty URL is returned.
+Returning sal_True and an empty URL means that the URL doesn't point
to a local file.
+*/
+static sal_Bool ConvertPhysicalNameToURL( const String rName, String
rReturn );
+static sal_Bool ConvertSystemPathToURL( const String rName, const
String rBaseURL, String rReturn );
-class UNOTOOLS_DLLPUBLIC LocalFileHelper
-{
-public:
-/**
-Converts a physical file name into a UCB compatible
URL ( if possible ).
-If no UCP is available for the local file system,
sal_False and an empty URL is returned.
-Returning sal_True and an empty URL means that the URL
doesn't point to a local file.
-*/
-static sal_Bool ConvertPhysicalNameToURL( const String rName, String
rReturn );
-static sal_Bool ConvertSystemPathToURL( const String rName, const String
rBaseURL, String rReturn );
-
-/**
-Converts a UCB compatible URL into a physical file
name.
-If no UCP is available for the local file system,
sal_False and an empty file name is returned,
-otherwise sal_True and a valid URL, because a file name
can always be converted if a UCP for the local
-file system is present ( watch: this doesn't mean that
this file really exists! )
-*/
-static sal_Bool ConvertURLToPhysicalName( const String rName, String
rReturn );
-static bool ConvertURLToPhysicalName( const rtl::OUString rName,
rtl::OUString rReturn );
-static sal_Bool ConvertURLToSystemPath( const String rName, String
rReturn );
-
-static sal_Bool IsLocalFile( const String rName );
-static sal_Bool IsFileContent( const String rName );
+/**
+Converts a UCB compatible URL into a physical file name.
+If no UCP is available for the local file system, sal_False and an
empty file name is returned,
+otherwise sal_True and a valid URL, because a file name can always be
converted if a UCP for the local
+file system is present ( watch: this doesn't mean that this file
really exists! )
+*/
+static sal_Bool ConvertURLToPhysicalName( const String rName, String
rReturn );
+static bool ConvertURLToPhysicalName( const rtl::OUString rName,
rtl::OUString rReturn );
+static sal_Bool ConvertURLToSystemPath( const String rName, String
rReturn );
-static ::com::sun::star::uno::Sequence ::rtl::OUString
-GetFolderContents( const ::rtl::OUString rFolder,
sal_Bool bFolder );
-};
+static sal_Bool IsLocalFile( const String rName );
+static sal_Bool IsFileContent( const String rName );
+static ::com::sun::star::uno::Sequence ::rtl::OUString
+
[Libreoffice-commits] .: autogen.sh
autogen.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a36addcc85c23e14aa9ac0d0cf32ea229b61
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jan 9 22:29:10 2012 +0100
autogen: sync vim modeline with emacs one
diff --git a/autogen.sh b/autogen.sh
index a37953c..f423fe1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -164,4 +164,4 @@ if (defined $ENV{NOCONFIGURE}) {
# indent-tabs-mode: nil
# End:
-# vim:set shiftwidth=4 softtabstop=4 expandtab: #
+# vim:set ft=perl shiftwidth=4 softtabstop=4 expandtab: #
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx | 206 +--
1 file changed, 161 insertions(+), 45 deletions(-)
New commits:
commit cbb7814247ad99eac2de0fac207774755bdfc2bd
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 9 17:06:56 2012 -0500
fdo#44546: Hopefully correct automatic calculation of y-axis scale.
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index cd188b7..b3f2c5a 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -79,11 +79,12 @@
#include svx/unoshape.hxx
#include functional
+#include map
+
+#include boost/ptr_container/ptr_map.hpp
+
+namespace chart {
-//.
-namespace chart
-{
-//.
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
@@ -1500,6 +1501,142 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double
rfMinimum, double rfMaxi
::rtl::math::setNan(rfMaximum);
}
+namespace {
+
+/**
+ * Keep track of minimum and maximum Y values for one or more data series.
+ * When multiple data series exist, that indicates that the data series are
+ * stacked.
+ *
+ * pFor each X value, we calculate separate Y value ranges for each data
+ * series in the first pass. In the second pass, we calculate the minimum Y
+ * value by taking the absolute minimum value of all data series, whereas
+ * the maxium Y value is the sum of all the series maximum Y values./p
+ *
+ * pOnce that's done for all X values, the final min / max Y values get
+ * calculated by taking the absolute min / max Y values across all the X
+ * values./p
+ */
+class PerXMinMaxCalculator
+{
+typedef std::pairdouble, double MinMaxType;
+typedef std::mapsize_t, MinMaxType SeriesMinMaxType;
+typedef boost::ptr_mapdouble, SeriesMinMaxType GroupMinMaxType;
+typedef boost::unordered_mapdouble, MinMaxType TotalStoreType;
+GroupMinMaxType maSeriesGroup;
+size_t mnCurSeries;
+
+public:
+PerXMinMaxCalculator() : mnCurSeries(0) {}
+
+void nextSeries() { ++mnCurSeries; }
+
+void setValue(double fX, double fY)
+{
+SeriesMinMaxType* pStore = getByXValue(fX); // get storage for given X
value.
+if (!pStore)
+// This shouldn't happen!
+return;
+
+SeriesMinMaxType::iterator it = pStore-lower_bound(mnCurSeries);
+if (it != pStore-end() !pStore-key_comp()(mnCurSeries, it-first))
+{
+MinMaxType r = it-second;
+// A min-max pair already exists for this series. Update it.
+if (fY r.first)
+r.first = fY;
+if (r.second fY)
+r.second = fY;
+}
+else
+{
+// No existing pair. Insert a new one.
+pStore-insert(
+it, SeriesMinMaxType::value_type(
+mnCurSeries, MinMaxType(fY,fY)));
+}
+}
+
+void getTotalRange(double rfMin, double rfMax) const
+{
+rtl::math::setNan(rfMin);
+rtl::math::setNan(rfMax);
+
+TotalStoreType aStore;
+getTotalStore(aStore);
+
+if (aStore.empty())
+return;
+
+TotalStoreType::const_iterator it = aStore.begin(), itEnd =
aStore.end();
+rfMin = it-second.first;
+rfMax = it-second.second;
+for (++it; it != itEnd; ++it)
+{
+if (rfMin it-second.first)
+rfMin = it-second.first;
+if (rfMax it-second.second)
+rfMax = it-second.second;
+}
+}
+
+private:
+/**
+ * Parse all data and reduce them into a set of global Y value ranges per
+ * X value.
+ */
+void getTotalStore(TotalStoreType rStore) const
+{
+TotalStoreType aStore;
+GroupMinMaxType::const_iterator it = maSeriesGroup.begin(), itEnd =
maSeriesGroup.end();
+for (; it != itEnd; ++it)
+{
+double fX = it-first;
+
+const SeriesMinMaxType rSeries = *it-second;
+SeriesMinMaxType::const_iterator itSeries = rSeries.begin(),
itSeriesEnd = rSeries.end();
+for (; itSeries != itSeriesEnd; ++itSeries)
+{
+double fYMin = itSeries-second.first, fYMax =
itSeries-second.second;
+TotalStoreType::iterator itr = aStore.find(fX);
+if (itr == aStore.end())
+// New min-max pair for give X value.
+aStore.insert(
+TotalStoreType::value_type(fX,
std::pairdouble,double(fYMin,fYMax)));
+else
+{
+MinMaxType r = itr-second;
+if (fYMin r.first)
+r.first =
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx | 206 +--
1 file changed, 161 insertions(+), 45 deletions(-)
New commits:
commit de9a19ab6ba28ce15fdcf25397540ce0ac02b416
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 9 17:06:56 2012 -0500
fdo#44546: Hopefully correct automatic calculation of y-axis scale.
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 2d1c7bb..6af1d3d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -79,11 +79,12 @@
#include svx/unoshape.hxx
#include functional
+#include map
+
+#include boost/ptr_container/ptr_map.hpp
+
+namespace chart {
-//.
-namespace chart
-{
-//.
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
@@ -1500,6 +1501,142 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double
rfMinimum, double rfMaxi
::rtl::math::setNan(rfMaximum);
}
+namespace {
+
+/**
+ * Keep track of minimum and maximum Y values for one or more data series.
+ * When multiple data series exist, that indicates that the data series are
+ * stacked.
+ *
+ * pFor each X value, we calculate separate Y value ranges for each data
+ * series in the first pass. In the second pass, we calculate the minimum Y
+ * value by taking the absolute minimum value of all data series, whereas
+ * the maxium Y value is the sum of all the series maximum Y values./p
+ *
+ * pOnce that's done for all X values, the final min / max Y values get
+ * calculated by taking the absolute min / max Y values across all the X
+ * values./p
+ */
+class PerXMinMaxCalculator
+{
+typedef std::pairdouble, double MinMaxType;
+typedef std::mapsize_t, MinMaxType SeriesMinMaxType;
+typedef boost::ptr_mapdouble, SeriesMinMaxType GroupMinMaxType;
+typedef boost::unordered_mapdouble, MinMaxType TotalStoreType;
+GroupMinMaxType maSeriesGroup;
+size_t mnCurSeries;
+
+public:
+PerXMinMaxCalculator() : mnCurSeries(0) {}
+
+void nextSeries() { ++mnCurSeries; }
+
+void setValue(double fX, double fY)
+{
+SeriesMinMaxType* pStore = getByXValue(fX); // get storage for given X
value.
+if (!pStore)
+// This shouldn't happen!
+return;
+
+SeriesMinMaxType::iterator it = pStore-lower_bound(mnCurSeries);
+if (it != pStore-end() !pStore-key_comp()(mnCurSeries, it-first))
+{
+MinMaxType r = it-second;
+// A min-max pair already exists for this series. Update it.
+if (fY r.first)
+r.first = fY;
+if (r.second fY)
+r.second = fY;
+}
+else
+{
+// No existing pair. Insert a new one.
+pStore-insert(
+it, SeriesMinMaxType::value_type(
+mnCurSeries, MinMaxType(fY,fY)));
+}
+}
+
+void getTotalRange(double rfMin, double rfMax) const
+{
+rtl::math::setNan(rfMin);
+rtl::math::setNan(rfMax);
+
+TotalStoreType aStore;
+getTotalStore(aStore);
+
+if (aStore.empty())
+return;
+
+TotalStoreType::const_iterator it = aStore.begin(), itEnd =
aStore.end();
+rfMin = it-second.first;
+rfMax = it-second.second;
+for (++it; it != itEnd; ++it)
+{
+if (rfMin it-second.first)
+rfMin = it-second.first;
+if (rfMax it-second.second)
+rfMax = it-second.second;
+}
+}
+
+private:
+/**
+ * Parse all data and reduce them into a set of global Y value ranges per
+ * X value.
+ */
+void getTotalStore(TotalStoreType rStore) const
+{
+TotalStoreType aStore;
+GroupMinMaxType::const_iterator it = maSeriesGroup.begin(), itEnd =
maSeriesGroup.end();
+for (; it != itEnd; ++it)
+{
+double fX = it-first;
+
+const SeriesMinMaxType rSeries = *it-second;
+SeriesMinMaxType::const_iterator itSeries = rSeries.begin(),
itSeriesEnd = rSeries.end();
+for (; itSeries != itSeriesEnd; ++itSeries)
+{
+double fYMin = itSeries-second.first, fYMax =
itSeries-second.second;
+TotalStoreType::iterator itr = aStore.find(fX);
+if (itr == aStore.end())
+// New min-max pair for give X value.
+aStore.insert(
+TotalStoreType::value_type(fX,
std::pairdouble,double(fYMin,fYMax)));
+else
+{
+MinMaxType r = itr-second;
+if (fYMin r.first)
+r.first =
[Libreoffice-commits] .: connectivity/source extensions/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 29 +++--
connectivity/source/drivers/mozab/mozab.xcu|2
connectivity/source/drivers/mozab/mozab2.xcu |2
extensions/source/abpilot/abspilot.src |2
4 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit 8d7e1a6e13008bd7d35896e676796196038f1105
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 9 23:56:33 2012 +0100
Enabling Icedove addressbook connection for Base (Thank you Caolan)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 4db639b..6e11eb3 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -69,24 +69,27 @@ namespace
}
// ---
-static const char* DefaultProductDir[3][3] =
+const size_t NB_PRODUCTS = 3;
+const size_t NB_CANDIDATES = 4;
+
+static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{
#if defined(XP_WIN)
-{ Mozilla/SeaMonkey/, NULL, NULL },
-{ Mozilla/Firefox/, NULL, NULL },
-{ Thunderbird/, Mozilla/Thunderbird/, NULL }
+{ Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Mozilla/Firefox/, NULL, NULL, NULL },
+{ Thunderbird/, Mozilla/Thunderbird/, NULL, NULL }
#elif(MACOSX)
-{ ../Mozilla/SeaMonkey/, NULL, NULL },
-{ Firefox/, NULL, NULL },
-{ ../Thunderbird/, NULL, NULL }
+{ ../Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Firefox/, NULL, NULL, NULL },
+{ ../Thunderbird/, NULL, NULL, NULL }
#else
-{ .mozilla/seamonkey/, NULL, NULL },
-{ .mozilla/firefox/, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/ }
+{ .mozilla/seamonkey/, NULL, NULL, NULL },
+{ .mozilla/firefox/, NULL, NULL, NULL },
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
#endif
};
-static const char* ProductRootEnvironmentVariable[3] =
+static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
{
MOZILLA_PROFILE_ROOT,
MOZILLA_FIREFOX_PROFILE_ROOT,
@@ -98,7 +101,7 @@ namespace
{
size_t productIndex = _product - 1;
-static ::rtl::OUString s_productDirectories[3];
+static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
if ( s_productDirectories[ productIndex ].isEmpty() )
{
@@ -117,7 +120,7 @@ namespace
const char* pProfileRegistry = profiles.ini;
// check all possible candidates
-for ( size_t i=0; i3; ++i )
+for ( size_t i=0; iNB_CANDIDATES; ++i )
{
if ( NULL == DefaultProductDir[ productIndex ][ i ] )
break;
diff --git a/connectivity/source/drivers/mozab/mozab.xcu
b/connectivity/source/drivers/mozab/mozab.xcu
index fa732d6..e554e46 100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -84,7 +84,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=Features
node oor:name=EscapeDateTime oor:op=replace
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu
b/connectivity/source/drivers/mozab/mozab2.xcu
index d1a620d..d6a6317 100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -52,7 +52,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=MetaData
node oor:name=SupportsBrowsing oor:op=replace
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 289e466..c246af9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE
{
HelpID = extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD;
Size= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-Text [ en-US ] = Thunderbird;
+Text [ en-US ] = Thunderbird/Icedove;
};
RadioButton RB_KAB
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/file_image_unx.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 05c51d5dfb58549e5bf26cb5c8b9b4f0083dca25
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jan 10 00:02:01 2012 +0100
Some cppcheck cleaning
diff --git a/desktop/unx/source/file_image_unx.c
b/desktop/unx/source/file_image_unx.c
index 078585f..fe3384b 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -90,6 +90,7 @@ int file_image_pagein (file_image * image)
file_imagew;
long s;
size_tk;
+// force touching of each page despite the optimizer
volatile char c = 0;
if (image == 0)
@@ -116,8 +117,6 @@ int file_image_pagein (file_image * image)
if (w.m_size 0)
{
c ^= ((char*)(w.m_base))[0];
-w.m_base = (char*)(w.m_base) + w.m_size;
-w.m_size -= w.m_size;
}
return (0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source tools/inc tools/source vcl/source
sfx2/source/appl/appopen.cxx |6 -
sfx2/source/appl/appserv.cxx |4
sfx2/source/bastyp/bitset.cxx| 14 --
sfx2/source/bastyp/minarray.cxx |9 -
sfx2/source/control/bindings.cxx | 22 ---
sfx2/source/control/ctrlitem.cxx | 15 --
sfx2/source/control/dispatch.cxx | 13 --
sfx2/source/control/msgpool.cxx |7 -
sfx2/source/control/objface.cxx |4
sfx2/source/control/request.cxx | 13 --
sfx2/source/control/statcach.cxx |6 -
sfx2/source/menu/mnuitem.cxx |8 -
sfx2/source/menu/mnumgr.cxx |5
sfx2/source/menu/virtmenu.cxx| 13 --
sfx2/source/notify/hintpost.cxx |3
sfx2/source/statbar/stbitem.cxx |1
sfx2/source/toolbox/tbxitem.cxx |1
sfx2/source/view/viewfrm.cxx |3
tools/inc/tools/debug.hxx| 33 -
tools/source/debug/debug.cxx | 75 -
vcl/source/app/dbggui.cxx| 220 ---
21 files changed, 3 insertions(+), 472 deletions(-)
New commits:
commit 1efa072b558d5b2aee03c658c4a781654985ba2b
Author: Marcel Metz mm...@adrian-broher.net
Date: Tue Jan 10 07:19:46 2012 +0100
Remove cruft in debug tools
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ebb9749..e60c108 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -530,8 +530,6 @@ sal_uIntPtr SfxApplication::LoadTemplate(
SfxObjectShellLock xDoc, const String
void SfxApplication::NewDocDirectExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT,
sal_False);
String aFactName;
if ( pFactoryItem )
@@ -565,8 +563,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest
rReq )
void SfxApplication::NewDocExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
// No Parameter from BASIC only Factory given?
SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME,
sal_False);
SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME,
sal_False);
@@ -696,8 +692,6 @@ bool lcl_isFilterNativelySupported(const SfxFilter rFilter)
void SfxApplication::OpenDocExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
sal_uInt16 nSID = rReq.GetSlot();
SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME,
sal_False );
if ( pFileNameItem )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f6eb9ca..3ac3122 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -182,7 +182,6 @@ static void showDocument( const char* pBaseName )
void SfxApplication::MiscExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
bool bDone = false;
switch ( rReq.GetSlot() )
{
@@ -616,8 +615,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
void SfxApplication::MiscState_Impl(SfxItemSet rSet)
{
-DBG_MEMTEST();
-
LocaleDataWrapper aLocaleWrapper(
::comphelper::getProcessServiceFactory(),
Application::GetSettings().GetLocale() );
const sal_uInt16 *pRanges = rSet.GetRanges();
DBG_ASSERT(pRanges *pRanges, Set without range);
@@ -886,7 +883,6 @@ static ::rtl::OUString getConfigurationStringValue(
void SfxApplication::OfaExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
switch ( rReq.GetSlot() )
{
case SID_OPTIONS_TREEDIALOG:
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 3c7bf60..1b5e750 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -38,7 +38,6 @@
BitSet BitSet::operator( sal_uInt16 nOffset ) const
{
-DBG_MEMTEST();
// create a work-copy, return it if nothing to shift
BitSet aSet(*this);
if ( nOffset == 0 )
@@ -89,7 +88,6 @@ BitSet BitSet::operator( sal_uInt16 nOffset ) const
BitSet BitSet::operator( sal_uInt16 ) const
{
-DBG_MEMTEST();
return BitSet();
}
@@ -99,12 +97,10 @@ BitSet BitSet::operator( sal_uInt16 ) const
void BitSet::CopyFrom( const BitSet rSet )
{
-DBG_MEMTEST();
nCount = rSet.nCount;
nBlocks = rSet.nBlocks;
if ( rSet.nBlocks )
{
-DBG_MEMTEST();
pBitmap = new sal_uIntPtr[nBlocks];
memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
}
@@ -118,7 +114,6 @@ void BitSet::CopyFrom( const BitSet rSet )
BitSet::BitSet()
{
-DBG_MEMTEST();
nCount = 0;
nBlocks = 0;
pBitmap = 0;
@@ -130,7 +125,6 @@ BitSet::BitSet()
BitSet::BitSet( const BitSet rOrig )
{
-DBG_MEMTEST();
CopyFrom(rOrig);
}
@@ -140,7 +134,6 @@ BitSet::BitSet( const BitSet rOrig )
BitSet::~BitSet()
{
-DBG_MEMTEST();
delete [] pBitmap;
}
@@ -150,7 +143,6 @@ BitSet::~BitSet()
BitSet BitSet::operator=( const BitSet rOrig )
{
-DBG_MEMTEST();
if ( this != rOrig )
{
delete [] pBitmap;
@@ -165,7 +157,6 @@ BitSet BitSet::operator=( const BitSet rOrig )
BitSet BitSet::operator=( sal_uInt16
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx | 10 --
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |6 --
2 files changed, 16 deletions(-)
New commits:
commit 6c61a9ba2e9f996dc8c94a7104be8f332bafddcb
Author: Marcel Metz mm...@adrian-broher.net
Date: Tue Jan 10 07:24:43 2012 +0100
Remove cruft in debug tools
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
index 9fcdce7..042eaa3 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
@@ -26,7 +26,6 @@
*
/
-#include tools/debug.hxx
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -42,7 +41,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator( USHORT nOffset ) const
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // create a work-copy, return it if nothing to shift
/*N*/ BitSet aSet(*this);
/*N*/ if ( nOffset == 0 )
@@ -97,12 +95,10 @@ namespace binfilter {
/*N*/ void BitSet::CopyFrom( const BitSet rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = rSet.nCount;
/*N*/ nBlocks = rSet.nBlocks;
/*N*/ if ( rSet.nBlocks )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ pBitmap = new ULONG[nBlocks];
/*N*/ memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
/*N*/ }
@@ -116,7 +112,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = 0;
/*N*/ nBlocks = 0;
/*N*/ pBitmap = 0;
@@ -128,7 +123,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet( const BitSet rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ CopyFrom(rOrig);
/*N*/ }
@@ -143,7 +137,6 @@ namespace binfilter {
/*N*/ BitSet::~BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pBitmap;
/*N*/ }
@@ -168,7 +161,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator-=(USHORT nBit)
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L (nBit % 32);
/*N*/
@@ -190,7 +182,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator|=( const BitSet rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMax = Min(nBlocks, rSet.nBlocks);
/*N*/
/*N*/ // expand the bitmap
@@ -227,7 +218,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator|=( USHORT nBit )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L (nBit % 32);
/*N*/
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bb2a1e5..366d692 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -40,7 +40,6 @@ namespace binfilter {
/*N*/ nGrow( nGrowSize ? nGrowSize : 1 ),
/*N*/ nUnused( nInitSize )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMSCBug = nInitSize;
/*N*/
/*N*/ if ( nMSCBug 0 )
@@ -53,7 +52,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::SfxPtrArr( const SfxPtrArr rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nUsed = rOrig.nUsed;
/*N*/ nGrow = rOrig.nGrow;
/*N*/ nUnused = rOrig.nUnused;
@@ -71,7 +69,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::~SfxPtrArr()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pData;
/*N*/ }
@@ -79,7 +76,6 @@ namespace binfilter {
/*N*/ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
/*N*/ nLen = Min( (USHORT)(nUsed-nPos), nLen );
/*N*/
@@ -133,7 +129,6 @@ namespace binfilter {
/*N*/ BOOL SfxPtrArr::Remove( void* aElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // einfache Aufgaben ...
/*N*/ if ( nUsed == 0 )
/*N*/ return FALSE;
@@ -153,7 +148,6 @@ namespace binfilter {
/*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ DBG_ASSERT( sal_Int32(nUsed+1) sal_Int32( USHRT_MAX / sizeof(void*)
), array too large );
/*N*/ // musz das Array umkopiert werden?
/*N*/ if ( nUnused == 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source sfx2/source tools/inc vcl/source
cui/source/dialogs/iconcdlg.cxx |2 +-
sfx2/source/dialog/tabdlg.cxx |4 ++--
tools/inc/tools/debug.hxx | 14 ++
vcl/source/app/dbggui.cxx |5 ++---
4 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit ef1602211907a222190b061d1d7f8a2a5ab9be66
Author: Marcel Metz mm...@adrian-broher.net
Date: Tue Jan 10 07:27:36 2012 +0100
Removed unused DBG_WARNING{4, 5} macros, replaced DBG_WARNINGFILE
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 519f3d1..73921d7 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -945,7 +945,7 @@ void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/,
IconChoicePage /*rPage*
SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
{
-DBG_WARNINGFILE( CreateInputItemSet nicht implementiert );
+SAL_INFO( cui, CreateInputItemSet not implemented );
return 0;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 108e46d..5ec3cc9 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -834,7 +834,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
}
else
{
-DBG_WARNINGFILE( TabPage-Id not known );
+SAL_INFO( sfx2, TabPage-Id not known );
}
}
@@ -973,7 +973,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
*/
{
-DBG_WARNINGFILE( CreateInputItemSet not implemented );
+SAL_INFO( sfx2, CreateInputItemSet not implemented );
return new SfxAllItemSet( SFX_APP()-GetPool() );
}
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index c335a0a..bf28581 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -45,8 +45,8 @@
Because the assertion macros (DBG_ASSERT, DBG_BF_ASSERT) have been used for
true assertions as well as to log warnings, they map to SAL_WARN instead of
standard assert. The warning and error macros (DBG_ASSERTWARNING,
-DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE,
-DBG_ERRORFILE) all map to SAL_INFO.
+DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING3, DBG_ERRORFILE) all map to
+SAL_INFO.
*/
//
@@ -457,13 +457,6 @@ public:
SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2)
#define DBG_WARNING3( aWarning, x1, x2, x3 ) \
SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3)
-#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) \
-SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aWarning, x1, x2, x3, x4)
-#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) \
-SAL_DETAIL_INFO_IF_FORMAT( \
-true, legacy.tools, aWarning, x1, x2, x3, x4, x5)
-#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_INFO_IF_FORMAT( \
-true, legacy.tools, aWarning, __FILE__, __LINE__)
#define DBG_ERRORFILE( aError ) \
SAL_DETAIL_INFO_IF_FORMAT(true, legacy.tools, aError, __FILE__, __LINE__)
@@ -535,9 +528,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_WARNING1( aWarning, x1 ) ((void)0)
#define DBG_WARNING2( aWarning, x1, x2 ) ((void)0)
#define DBG_WARNING3( aWarning, x1, x2, x3 ) ((void)0)
-#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) ((void)0)
-#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) ((void)0)
-#define DBG_WARNINGFILE( aWarning ) ((void)0)
#define DBG_ERRORFILE( aError ) ((void)0)
#define DBG_TESTSOLARMUTEX() ((void)0)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index cb25dfd..d8cc776 100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -176,9 +176,8 @@ static const sal_Char* pDbgHelpText[] =
dropdown list.\n
\n,
Warnings\n,
-DBG_WARNING() can be used to output warnings. DBG_WARNINGFILE() also outputs
-the file and the line number where the macro is located. DBG_WARNING1() to
-DBG_WARNING5() can be used to produce formatted output (printf format
string).
+DBG_WARNING() can be used to output warnings. DBG_WARNING1() to
+DBG_WARNING3() can be used to produce formatted output (printf format
string).
In case you want to have conditional warnings DBG_ASSERTWARNING() can be
used. The warning will be produced if the condition was not met. The first
parameter is the condition and the second parameter is the message to be
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] [PATCH] ScGlobal::GetAutoFormat not always required to create fresh instance
On 01/07/2012 02:07 AM, Kohei Yoshida wrote: Anyway, it's my understanding that the main problem is that the global ScAutoFormat instance unintentionally get instantiated in the destructor of ScAutoFormatObj during the termination of the cppunit? In that case, what I would do is to add ScGlobal::HasAutoFormat() which simply checks whether the instance already exists, and if yes go on ahead and save if the flag is set. When no such instance exists there is no need to save stuff anyway (since there is no data to save). Another advantage of this is that we wouldn't have to modify all the code that currently uses GetAutoFormat() expecting it to return a live instance at all times, and we could only modify the code in ~ScAutoFormatObj(). A new HasAutoFormat (only) called from ~ScAutoFormatObj would of course solve the immediate problem, too. However, whether it actually would be an advantage to not have to address the other calls to GetAutoFormat, I am not sure. After all, those calls that afterwards check for null-ness *are* dubious. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ScGlobal::GetAutoFormat not always required to create fresh instance
On 01/09/2012 08:10 AM, Markus Mohrhard wrote: In my opinion we have two bugs here.. The ScGlobal::ppRscStrin is being deleted in the ScModule destructor which means that calc is no longer open. So the question is why do we delete ScAutoFormatObj after ScModule and the second one is that we are creating the object in the destructor. The ScAutoFormatObj is still held remotely when Desktop::DeregisterServices disposes the URP connection via which the object is held. That UNO objects are held longer than necessary is normal, as e.g. a Java process only releases them when it decides to garbage-collect its proxies for those objects. I assume that ScGlobal is cleaned up also due to some disposing from within Desktop::DeregisterServices, but the order in which things are disposed here is indeterminate. So it can happen that Calc UNO objects are disposed after ScGlobal has already been cleared. (It is generally understood to be a bad idea to do anything---other than merely cleaning up by---from within disposing/destroying UNO objects.) This is indeed a general problem, and it can potentially cause other problems besides the one we see with the crash at hand. And then there might be a simple solution to both problems at the same time. If possible we could add a variable to ScAutoformatObj storing a sheet::SpreadsheetDocument (the uno interface behind ScModule and therefore force the right destruction order. I did not test this idea but I did something similar for ScDatabaseRangesObj and ScDatabaseRangeObj to prevent the destruction of the ScDatabaseRangesObj before the ScDatabaseRangeObj. Three points: 1 If ScAutoFormatObj requires an ScModule (which in turn controls ScGlobal?), then it would indeed look correct to keep a reference to an ScModule instance with every ScAutoFormatObj instance. What one would potentially need to look out for is ring references. (I know way to little about the Calc architecture to know whether this is actually relevant here.) 2 On the other hand, it might also be an error that ScAutoFormatObj still requires an ScModule/ScGlobal during destruction (see above), in which case the proper fix could be to fix ~ScAutoFormatObj (by somehow redesigning the class to do the saving earlier). (And in which case point 1 might become irrelevant---if some other protocol already guarantees that the ScModule/ScGlobal is alive as long as an ScAutoFormatObj may need it---, or an orthogonal issue that could be fixed independently.) 3 And after all, the null-checking calls to GetAutoFormat would still be dubious and should be addressed. (But again, that would become an orthogonal issue that could be fixed independently.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Python Bridge on MacOS x64 with python default
On 01/08/2012 06:59 PM, Ovnicraft wrote: On Wed, Jan 4, 2012 at 3:05 AM, Stephan Bergmann sberg...@redhat.com mailto:sberg...@redhat.com wrote: The Python--UNO bridge is included in LO itself (see LibreOffice.app/Contents/__MacOS/py*), the SDK traditionally has little (additional) support for PyUNO. Well i found it in 3.5 beta, so there is any way to use/compile python-uno bridge in standalone mode ? No, no easy way to extract PyUNO from LO, neither at build time (i.e., only build PyUNO parts of LO) nor at runtime (i.e., only install PyUNO parts of LO). I was thinking in a harder way to write a python layer over c/c++ bridge, any opinion around ? Sorry, don't get what you mean here. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Does smoketest run on cygwin? or package format another than archive?
On 01/08/2012 06:47 PM, Korrawit Pruegsanusak wrote: This is a consequence of trying to fix the build on windows / cygwin. I tried to run a smoketest by running `/opt/lo/bin/make check`, and it gives an error http://pastebin.com/EarX4TC0 From an error, IMHO it tried to find an archive version of the installation tree, which I don't have, because I build with --with-package-format=installed. OK, I should have tried --with-package-format=archive, but I don't have time to do this (my exam is coming and my computer isn't so powerful), thus sorry for my too-fast question. Anyway, I noticed that the path should be (comparing with what I have) instsetoo_native/wntmsci12.pro/LibreOffice_Dev/archive/... instead of current instsetoo_native/wntmsci12.pro/LibreOffice/archive/... or this smoketest is not for dev build, but for release build only? The original design (in OOo) was as follows: instsetoo_native was modified to always build an en-US archive installation set in addition to whatever was requested through --with-package-format/--with-lang/whatever. smoketestoo_native depended on instsetoo_native and extracted that archive installation set to solver/*/installation/, to be used by the smoketest and by any subsequenttests. The logic to extract the solver installation set is at the end of smoketestoo_native/makefile.mk. However, the long pathnames into .../solver/*/installation/ were a problem on Windows, which cannot naturally cope with paths longer than 260 characters. To work around that, on Windows only, the installation set was not extracted to solver once while building smoketestoo_native, but instead was extracted to a temp directory whenever it was needed (by smoketest and by any subsequenttest) and removed again afterwards. (With the assumption that those temp paths would be substantially shorter than the solver ones.) The Windows-only logic to extract the installation archive to temp and remove it again afterwards is in solenv/inc/installationtest.mk. Then someone changed at least the first part in LO, where the solver installation set is no longer produced in a two-step way (create an archive in instsetoo_native, extract it in smoketestoo_native), but rather as a single step by calling ooinstall at the end of smoketestoo_native/makefile.mk (which creates solver/*/installation/ directly, without producing an archive first). My hope would be that the Windows-specific code would have been adapted accordingly, and that at least some of the regular Windows builds would actually exercise the smoketest. Might be that those assumptions are false, though. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] Also gives BoundListeners a CPPUHELPER_DLLPUBLIC
On 01/08/2012 06:04 PM, Korrawit Pruegsanusak wrote: This attached patch gives class BoundListeners a CPPUHELPER_DLLPUBLIC, which resolves error LNK2019: unresolved external symbol for the symbols in this class. Although BoundListeners' parent (PropertySetMixinImpl) already has CPPUHELPER_DLLPUBLIC, but it seems to be not enough, which I'm not sure why. Looks like MSVC does not automatically inherit __declspec annotations in nested class definitions. Pushed, thanks. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] If there's no java, don't do the java stuff
On Mon, Jan 09, 2012 at 12:24:25AM +0700, Korrawit Pruegsanusak wrote: Hello all, This attached patch fixes build on windows / cygwin. I'm building --without-java, and it breaks because not found java_uno_accessbridge, which seems java-related. So, I add a check whether we have SOLAR_JAVA before doing this thing. Sure, thanks, pushed. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] msvc doesn't allow dll interface in both class and functions
On 01/08/2012 06:20 PM, Korrawit Pruegsanusak wrote: IMHO, the problem is caused by part of the commit [1] Seems msvc doesn't allow us to have SAL_DLLPUBLIC_EXPORT in both class and functions definition. It throws compiler error C2487 [2] So, I tried to fix with 2 methods: 1. Remove dll interface from functions definition, now the whole class has dll interface 2. Remove dll interface from class definition, and only some functions has dll interface which I attached both patches. Fixed in a third way now, http://cgit.freedesktop.org/libreoffice/core/commit/?id=2fa19ed7e407188d6af028aad19a2598454959a8, reducing the set of exported symbols to just what is needed by extensions/qa/update/test_update.cxx. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] Complete removal of the Windows/Linux quickstarter, was: Re: Removing LibO on Windows ...
On Sun, 2012-01-08 at 16:34 +0100, Regina Henschel wrote: It's the OS's domain to (quickly) start applications, and OS's are pretty good at that. If you want to start anything particularly quickly on... Hey ho ;-) clearly the more cruft we can remove the better, but at least for older machines - and particularly those with hard disks, the quick-starter should make quite a substantial difference. Then again, if we can get link-time-optimisation going, and more of our code munged into one big shlib, and the faster startup that should give for everything then - it prolly makes sense. Is this a 4.0 feature we can add to the 4.0 plan ? http://wiki.documentfoundation.org/Development/LibreOffice4 HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] libvisio: how can I help?
Hi Bruno, On Sun, 2012-01-08 at 14:53 +, Bruno Girin wrote: I've been doing some tests with sample Visio files and I've now added a grand total of 7 bug reports [1]. Nice work testing ! :-) I would like to start tackling some of them but as I'm not familiar with the code base, I would welcome suggestions as to which ones are likely to be reasonably easy hacks. I'm not an expert on this - so treat this with a pinch of salt, until Fridrich arrives ;-) From what I recall, most of Fridrich's filters essentially generate SAX style events and these are rendered onto the libwpg::WPGPaintInterface 'painter' - which in turn generates ODF. So - to extend it; I'd save your broken document as flat ODF: a.fodg, then tweak it to be the document it should be and re-save as b.fodg. When you diff -u these two files you should see the elements and attributes that have changed. Armed with that, I'd poke at the libvisio code and the WPGPaintInterface to see how it converts that good stuff, and the attributes / elements associated with that extend the code to handle your cases. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] About cppcheck 2 reports for desktop/unx/source/file_image_unx.c
On 01/08/2012 12:25 PM, julien2412 wrote: For the file desktop/unx/source/file_image_unx.c, cppcheck tells : 120 duplicateExpression style Same expression on both sides of '-'. 93 unreadVariable style Variable 'c' is assigned a value that is never used line 93 is : volatile char c = 0 Should this variable just be removed or c should be used in a way ? What is done here is to touch a byte from every page of an mmap'ed file, in order to make sure the file is actually read in completely. Hence the volatile. I guess we should live with the false cppcheck positive (or educate cppcheck to not assume writes to volatile variables need to be followed by reads). What you could do, though, is to add a comment to c like intentionally only written to and never read. line 120 is : w.m_size -= w.m_size; Either this is right and it could be simplified with w.m_size = 0 or it's wrong and what should it be ? (this time no overload operator trick since it's plain C :-) ) The idea indeed appears to be to reduce w.m_size to zero. However, since w is a local struct that is not used afterwards, anyway, it would probably be clearer to simply remove the two lines w.m_base = ... w.m_size = ... from that last if-block. For both of them, if there's a easy fix, I suppose I may commit/push it on master, but on branch 3.5 too ? Yes, please push to master. These are fixing stylistic issues only, not real bugs, so I would not bother with 3.5 (unless you want to cppcheck the 3.5 branch and thus want to remove noise there). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] About cppcheck 2 reports for desktop/unx/source/file_image_unx.c
Hi Julien, On Sun, 2012-01-08 at 03:25 -0800, julien2412 wrote: For the file desktop/unx/source/file_image_unx.c, cppcheck tells : line 120 is : w.m_size -= w.m_size; Either this is right and it could be simplified with w.m_size = 0 or it's wrong and what should it be ? (this time no overload operator trick since it's plain C :-) ) Assign to zero - it's fine ;-) 93unreadVariable style Variable 'c' is assigned a value that is never used line 93 is : volatile char c = 0 Should this variable just be removed or c should be used in a way ? This is in fact deliberate; I'd add a comment in the source: /* force touching of each page despite the optimizer */ The basic problem is that we memory map the file, and then want to force each page in turn into memory - the issue with that is that we don't really care what is there; so we do this bogus XOR sum in 'c' - but without the volatile clever compilers will realise that this is not doing anything and optimise it all away - so we will touch no pages, and the I/O will not get done, and 'pagein' becomes a no-op ;-) For both of them, if there's a easy fix, I suppose I may commit/push it on master, but on branch 3.5 too ? Best to have cleanups just on master I think unless they are bug fixes. Anyhow - thanks for catching this :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] UI disaster on Windows: soffice -h
Hi Andras, On Sat, 2012-01-07 at 23:56 +0100, Andras Timar wrote: I've just found this feature, soffice -h displays a dialog box on Windows with some help text. Heh - what fun :-) Problems: 1. Dialog is not localisable. Help text comes from const char arrays in desktop/source/app/cmdlinehelp.cxx Hey ho - it's reliable and quick to get I suppose; but I see no real problems moving it out into a .src file and translating it. 2. Help text is clipped, there is not enough room on the dialog. 3. If I resized the dialog, it would not fit on a 1024x768 screen. It's all pretty horrible really; we have this beautiful document / layout engine and we go and do nasty things like this for (essentially) pages of the documentation ;-) Could we not throw up the help browser instead showing a page with this content ? There is already just such a help page ;-) presumably it is already translated, and then perhaps we could kill those strings in cmdlinehelp.cxx almost completely. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] UI disaster on Windows: soffice -h
On 01/07/2012 11:56 PM, Andras Timar wrote: I've just found this feature, soffice -h displays a dialog box on Windows with some help text. Problems: 1. Dialog is not localisable. Help text comes from const char arrays in desktop/source/app/cmdlinehelp.cxx 2. Help text is clipped, there is not enough room on the dialog. 3. If I resized the dialog, it would not fit on a 1024x768 screen. I wonder, if we could fix this before UI freeze on Monday. I need your input regarding how to present this information to users. Not sure we need either this dialog box or any localization at all: On other platforms, soffice -h outputs to stdout (or maybe stderr). Given that adding command line arguments (what soffice -h educates about) is presumably done mostly through some terminal, anyway, I'm not sure there is any demand to display this help information in a dialog instead of on stdout/err. I don't know what the current status of GUI applications like soffice routinely printing to stdout/err is on current Windows versions, so I don't know if this hack to use a dialog is still needed. (The unopkg executable used to go to pains to be able to use stdin/out/err even though it is a GUI application, wrapping unopkg.exe in a unopkg.com that does the necessary console magic.) Independent of that, I'm always puzzled when programs localize information about their technical interfaces that are English-centric, anyway. (Like a C compiler localizing its error messages, where the C++ language constructs are English tokens; or soffice localizing documentation of its command line arguments, where those arguments are English tokens.) But maybe that is just me. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] UI disaster on Windows: soffice -h
2012/1/9 Michael Meeks michael.me...@suse.com: Hi Andras, On Sat, 2012-01-07 at 23:56 +0100, Andras Timar wrote: I've just found this feature, soffice -h displays a dialog box on Windows with some help text. Heh - what fun :-) Problems: 1. Dialog is not localisable. Help text comes from const char arrays in desktop/source/app/cmdlinehelp.cxx Hey ho - it's reliable and quick to get I suppose; but I see no real problems moving it out into a .src file and translating it. 2. Help text is clipped, there is not enough room on the dialog. 3. If I resized the dialog, it would not fit on a 1024x768 screen. It's all pretty horrible really; we have this beautiful document / layout engine and we go and do nasty things like this for (essentially) pages of the documentation ;-) Could we not throw up the help browser instead showing a page with this content ? There is already just such a help page ;-) presumably it is already translated, and then perhaps we could kill those strings in cmdlinehelp.cxx almost completely. Indeed, there is helpcontent2/source/text/shared/guide/start_parameters.xhp but it is outdated. Maybe I can update it quickly... I'll also try what Stephan suggested, i.e. if we can print to stdout in Windows, too. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] Replace Table with std::set.
On 01/07/2012 10:13 PM, Marcel Metz wrote: this patch removes another use of the tools Table class. Pushed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=04292aee154d03e87395722d314c60be6c10b2ec, thanks. (Please consider using git format-patch to produce patches in the future. It slightly simplifies things for committers.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] UI disaster on Windows: soffice -h
Andras Timar schrieb: I've just found this feature, soffice -h Hello, we have a Bug for that: https://bugs.freedesktop.org/show_bug.cgi?id=34540 CU Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] UI disaster on Windows: soffice -h
I'll also try what Stephan suggested, i.e. if we can print to stdout in Windows, too. Note that one layer of silly wrapping could probably be dropped by using AttachConsole(ATTACH_PARENT_PROCESS) followed by freopen()ing stdout and stderr to CONOUT$. AttachConsole() is present on XP and later. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [MacOS] Starting dev-install is hairy
On 01/07/2012 09:07 AM, James C wrote: I've had trouble working out, from the code, what a user installation path is. There are two classes called Bootstrap, and my one reads the details from a map, which I assume is populated somewhere. utl::Bootstrap::locateUserInstallation from unotools/bootstrap.hxx effectively returns the value for the UserInstallation key stored in the bootstrap ini file (program/bootstraprc on Unix, program/bootstrap.ini on Windows). The rtl::Bootstrap class is lower-level, it manages the set of so-called bootstrap variables that can be set via ini files, environment variables, and command line arguments. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] libvisio: how can I help?
Hello, On 09/01/12 11:24, Michael Meeks wrote: I would like to start tackling some of them but as I'm not familiar with the code base, I would welcome suggestions as to which ones are likely to be reasonably easy hacks. I'm not an expert on this - so treat this with a pinch of salt, until Fridrich arrives ;-) From what I recall, most of Fridrich's filters essentially generate SAX style events and these are rendered onto the libwpg::WPGPaintInterface 'painter' - which in turn generates ODF. So - to extend it; I'd save your broken document as flat ODF: a.fodg, then tweak it to be the document it should be and re-save as b.fodg. When you diff -u these two files you should see the elements and attributes that have changed. Armed with that, I'd poke at the libvisio code and the WPGPaintInterface to see how it converts that good stuff, and the attributes / elements associated with that extend the code to handle your cases. Reasonably accurate account, given that Michael is a real novice in this realm of spirit. But, let me give a quick overview of libvisio architecture: 1) Two main api fuctions principally in VisioDocument.h: a) isSupported b) parse One convenience function in the same header: c) generateSVG 2) VSDXParser class is the base class for reading the documents. VSD6Parser and VSD11Parser are derived classes that cater for differences between the two formats. 3) Document is read twice and the reader classes call functions of the VSDXCollector interface, first using the VSDXStylesCollector and second time using the VSDXContentCollector to receive the information. 4) VSDXContentCollector is processing information received from parser along with information collected by the VSDXStylesCollector and calling the callbacks from the libwpg::WPGPaintInterface. 5) Some complications given the need to first store some elements of a shape into memory and then output them using the information about in which order they should be painted. Now, if you have cases of shapes that are not correctly converted, the best is to take the document, copy it and try to create a minumum document that still exhibits the problem. Then we can together introspect it and try to find the reasons of that misbehaviour. Like that I can help you to get into the logic of the file-format. Any chance you can be on IRC during CET day? F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] UI disaster on Windows: soffice -h
Stephan Bergmann-2 wrote Not sure we need either this dialog box or any localization at all: On other platforms, soffice -h outputs to stdout (or maybe stderr). Given that adding command line arguments (what soffice -h educates about) is presumably done mostly through some terminal, anyway, I'm not sure there is any demand to display this help information in a dialog instead of on stdout/err. I don't know what the current status of GUI applications like soffice routinely printing to stdout/err is on current Windows versions, so I don't know if this hack to use a dialog is still needed. (The unopkg executable used to go to pains to be able to use stdin/out/err even though it is a GUI application, wrapping unopkg.exe in a unopkg.com that does the necessary console magic.) As a long time Windows Power User, I agree with this comment and also with Tor's comments on the Bug report mentioned. If a Windows user is knowledgeable enough to pass command line switches (in my experience that would be 1% or less :) ) he expects the output of such switches to be displayed as text on the terminal window (aka DOS box :) ) Otherwise any other Help that requires a GUI, l10n and formatting belongs in the Help file Just my 2 (non-dev) cents. -- Pedro -- View this message in context: http://nabble.documentfoundation.org/UI-disaster-on-Windows-soffice-h-tp3641073p3644284.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||43989 --- Comment #81 from Petr Mladek pmla...@suse.cz 2012-01-09 03:18:05 PST --- (In reply to comment #79) Nominate Bug 43989 - After installation first launch terminates after splash screen. Although it seems completely harmless, that's no good first impression of a fresh installed software. We should be sure that that will not happen with RC1. I agree that it is annoying = added. On the other hand, you saw it also with 3.4.5 = it is older bug = it is not must to have for rc1. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] UI disaster on Windows: soffice -h
Hi, Indeed, there is helpcontent2/source/text/shared/guide/start_parameters.xhp but it is outdated. Maybe I can update it quickly... I'll also try what Stephan suggested, i.e. if we can print to stdout in Windows, too. On Windows console applications naturally print parameters to stdout. GUI applications don't usually have command parameters. The ones that are not directly callable by the user, like msiexec, show a dialogbox with the options. I would say using a dialbox to show the options is a more natural way to do it. Although I don't have any strong opinion on this subject. -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] UI disaster on Windows: soffice -h
Hello, On 07/01/12 23:56, Andras Timar wrote: I've just found this feature, soffice -h displays a dialog box on Windows with some help text. Problems: 1. Dialog is not localisable. Help text comes from const char arrays in desktop/source/app/cmdlinehelp.cxx 2. Help text is clipped, there is not enough room on the dialog. 3. If I resized the dialog, it would not fit on a 1024x768 screen. I wonder, if we could fix this before UI freeze on Monday. I need your input regarding how to present this information to users. OK, since this thread was already answered by many and I basically agree with Tor, I will only point out one alternative: Microsoft tools that can be called from command-line and that are not console applications sometimes after being called as foo.exe /? give a MsgBox of command-line options. Try msiexec.exe /? Although, the attachconsole foo that Tor mentioned is really a good thing to do and we do it in many Gnome applications for windows. Cheers Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Bug 39428 (https://bugs.freedesktop.org/show_bug.cgi?id=39428#c1)
On 01/06/2012 06:08 PM, Keith McRae wrote:
Building tools/ results in errors from tools/inc/fract.o,
tools/inc/tools/gen.o, tools/source/generic/fract.o and
tools/source/generic/poly.o due to undefined reference to
SvStream::operator(long)
Question: Should I modify these classes to use the sal_ types?
You can either use a temporary sal_Int32 variable for just the operator
call and leave the surrounding code using long, or you can go the
extra mile of making the surrounding code use sal_Int32, too. But note
that this can quickly grow into a large additional task that you would
probably not want to mix with the task at hand. So, in all but trivial
cases it might be best to go with the first option, potentially adding a
comment to why such a temporary variable is needed (which can be removed
again when the surrounding code is eventually cleaned up).
In basic/source/sbx/sbxvalue.cxx - functions SbxValue::LoadData and
SbxValue::StoreData which both have comments and workarounds for
SvStream having operator/ (long) defined.
Those workarounds for SbxSALINT64 can be removed then, directly
operating on the nInt64 member instead.
In basic/source/runtime/methods1.cxx - function:
sal_Bool lcl_WriteSbxVariable( const SbxVariable rVar, SvStream* pStrm,
sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
case SbxSALINT64:
case SbxSALUINT64:
if( bIsVariant )
*pStrm (sal_uInt16)SbxSALINT64; // VarType Id
*pStrm (sal_uInt64)rVar.GetInt64();
break;
BUT, in the corresponding read function:
sal_Bool lcl_ReadSbxVariable( SbxVariable rVar, SvStream* pStrm,
sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
case SbxSALINT64:
case SbxSALUINT64:
{
sal_uInt32 aInt;
*pStrm aInt;
rVar.PutInt64( (sal_Int64)aInt );
}
break;
So it serializes a sal_uInt64 but deserializes a sal_uInt32. Could this
be a potential problem?
This indeed looks like a bug.
In editeng/source/rtf/rtfgrf.cxx - function:
static void WriteBMPHeader( SvStream rStream, const SvxRTFPictureType
rPicType )
This makes heavy use of the SWAP_LONG macro from solar.h via an inline
SwapLong function while serializing sal_ types. SvStream already swaps
the bytes depending on the endianness, so is this (possible) double
swapping necessary?
This also does not look right. --- Unless the BMP shall be in platform
byte-order, in which case the additional swap on big-endian would cancel
out with SvStream's internal swap. But
http://en.wikipedia.org/wiki/BMP_file_format states that BMP uses
little-endian, so this is probably indeed a bug (and exporting RTF
bitmaps has never been tested with Solaris SPARC OOo...).
Thanks a lot for this in-depth work. Let us know if you find any other
obstacles.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] Replace Table with std::set.
On 01/09/2012 11:56 AM, Stephan Bergmann wrote: (Please consider using git format-patch to produce patches in the future. It slightly simplifies things for committers.) Forget it, I failed to notice that the OP apparently was produced with git send-email (instead of manually creating an email and attaching the git format-patch patch to it). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] If there's no java, don't do the java stuff
Hi Korrawit, At 18:24 8-1-2012, Korrawit Pruegsanusak wrote: Hello all, This attached patch fixes build on windows / cygwin. I'm building --without-java, and it breaks because not found java_uno_accessbridge, which seems java-related. I noticed on the mailing list that David Tardon has already pushed your patch, but I'm still curious to know: did you have the Java Access Bridge [1] installed when you tested this patch (I assume you didn't have it because the build broke)? [1] http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136191.html So, I add a check whether we have SOLAR_JAVA before doing this thing. So java_uno_accessbridge is only added when SOLAR_JAVA is set to TRUE, which AFAICT is something that happens at compile time. I assume this patch is part of the work to (locate and) reduce Java dependencies in order to (1) make it easier for developers to build LibreOffice (e.g. when working on patches that have nothing to do with Java), and (2) eventually transition to a LibreOffice without any Java (i.e. for everybody, not just developers). So when the Java Accessibility API has been replaced by the IAccessible2 API, and when the Java-dependent wizards have been replaced, SOLAR_JAVA will become irrelevant. I'm basically trying to increase my understanding of what's going on, so feel free to correct me of I get it wrong :-) Best regards, Christophe My incremental build went fine after this patch, and the program started well :-) Please feel free to comment :-) Best Regards, -- Korrawit Pruegsanusak -- Christophe Strobbe K.U.Leuven - Dept. of Electrical Engineering - SCD Research Group on Document Architectures Kasteelpark Arenberg 10 bus 2442 B-3001 Leuven-Heverlee BELGIUM tel: +32 16 32 85 51 http://www.docarch.be/ Twitter: @RabelaisA11y --- Open source for accessibility: results from the AEGIS project www.aegis-project.eu --- Please don't invite me to Facebook, Quechup or other social networks. You may have agreed to their privacy policy, but I haven't. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Change in addition for date handling (intentional change??)
On 06/01/12 21:39, Andrew Douglas Pitonyak wrote: Off hand, I might be inclined to simply move the code back to its original location, which would set the behavior back to letting math with dates return dates, rather than just specific operations (which is not even supported now). yeah I agree, I see no reason why the code shouldn't be moved back to where it was, seems this did indeed creep in here from the orig patch we got for the currency work and appears I didn't spot this when reviewing it :-) Thanks for catching and finding this. Changed this on master Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] If there's no java, don't do the java stuff
On 09/01/12 13:04, Christophe Strobbe wrote: So java_uno_accessbridge is only added when SOLAR_JAVA is set to TRUE, which AFAICT is something that happens at compile time. I assume this patch is part of the work to (locate and) reduce Java dependencies in order to (1) make it easier for developers to build LibreOffice (e.g. when working on patches that have nothing to do with Java), and (2) eventually transition to a LibreOffice without any Java (i.e. for everybody, not just developers). So when the Java Accessibility API has been replaced by the IAccessible2 API, and when the Java-dependent wizards have been replaced, SOLAR_JAVA will become irrelevant. I'm basically trying to increase my understanding of what's going on, so feel free to correct me of I get it wrong :-) indeed SOLAR_JAVA is essentially just for developers to get a (marginally) faster build, and for esoteric platforms where Java isn't available; release builds on mainstream platforms are going to have Java enabled (as it's necessary for Base, extensions, a11y and a couple other things). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Le 05/01/12 20:11, Stephan Bergmann a écrit : Hi Stephan, I simply sticked to the --with-doxygen scheme for now. Tinderbox maintainers, please remember to install doxygen if not yet present (preferred) or add --without-doxygen to autogen.lastrun (which will cause the C++ documentation to be missing from the SDK). Does this mean that there is a new dependency for the Mac OSX build, as doxygen is not provided with the OS as is ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Hi *, On Mon, Jan 9, 2012 at 3:38 PM, Alexander Thurgood alex.thurg...@gmail.com wrote: Le 05/01/12 20:11, Stephan Bergmann a écrit : I simply sticked to the --with-doxygen scheme for now. Tinderbox maintainers, please remember to install doxygen if not yet present (preferred) or add --without-doxygen to autogen.lastrun (which will cause the C++ documentation to be missing from the SDK). Does this mean that there is a new dependency for the Mac OSX build, as doxygen is not provided with the OS as is ? It is only required if you want to build the documentation from the source-files. So for release-builds: yes, it is required. For the casual developer: No, not required, and you don't usually build the SDK in that case at all. http://wiki.documentfoundation.org/Development/Install_Mac_OS_X_Dependencies#But_I_want_to_build_the_UNO_SDK ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] About enabling Icedove addressbook connection for Base
On Fri, 2012-01-06 at 14:27 -0800, julien2412 wrote: Last thing : I don't know if the change in extensions/source/abpilot/abspilot.src is useful or even right. Does the patch seem ok ? (if yes, i can commit and push it on master) Looks sane to me, go for it. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Le 09/01/12 15:51, Christian Lohmaier a écrit : Hi Christian, It is only required if you want to build the documentation from the source-files. So for release-builds: yes, it is required. For the casual developer: No, not required, and you don't usually build the SDK in that case at all. http://wiki.documentfoundation.org/Development/Install_Mac_OS_X_Dependencies#But_I_want_to_build_the_UNO_SDK Ah, thanks for that, most useful, but doesn't the SDK need to be built if you are building extensions, or am I conufusing that with the ODK ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEWED] [PUSHED 3-4] fix for fdo#44442, crash in ScInterpreter::GetDBParam with specific document
Hi Markus, On Sunday, 2012-01-08 21:19:13 +0100, Markus Mohrhard wrote: In case this needs to go to the -3-4-5 branch, we'll need 2 more sign-off's. I think that 3-4-5 is through and it is not a high priority patch. I think it only happens in rare circumstances. However, in case we wanted it in here'd be my sign-off (one more needed). Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgplzOOxW6UCU.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On 01/09/2012 04:12 PM, Alexander Thurgood wrote: Ah, thanks for that, most useful, but doesn't the SDK need to be built if you are building extensions, or am I conufusing that with the ODK ? The names SDK, ODK, and UDK are used somewhat interchangeably. But the SDK is not needed to build extensions during the build of LO itself. It is only used by extensions developers to build freestanding extensions (that are not included in the LO source tree). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On Mon, Jan 9, 2012 at 4:12 PM, Alexander Thurgood alex.thurg...@gmail.com wrote: Le 09/01/12 15:51, Christian Lohmaier a écrit : Hi Christian, It is only required if you want to build the documentation from the source-files. So for release-builds: yes, it is required. For the casual developer: No, not required, and you don't usually build the SDK in that case at all. http://wiki.documentfoundation.org/Development/Install_Mac_OS_X_Dependencies#But_I_want_to_build_the_UNO_SDK Ah, thanks for that, most useful, but doesn't the SDK need to be built if you are building extensions, [...] Yes, and that's why I wrote it is required for release-builds. But unless you publish your LibreOffice SDK/ODK package for download, then you are free to build the ODK without generated documentation. So when you build you can: * skip building the SDK/ODK altogether: --disable-odk (that's what most devs will use, along --disable-binfilter) * build the SDK/ODK, but without generated documentation: --without-doxygen The resulting package is perfectly fine for your personal use and will work to develop extensions, but doesn't contain the html-documentation and hence not suitable for distribution. * build the SDK/ODK with the generated documentation: Only this requires doxygen installed on the buildsystem. An extension developer doesn't need to build LibreOffice - he/she can just download the SDK from www.libreoffice.org and won't need doxygen. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44498, which changed state. Bug 44498 Summary: All OpenDocument files created with LibO 3.4 or 3.5 are considered as invalid by Microsoft Office https://bugs.freedesktop.org/show_bug.cgi?id=44498 What|Old Value |New Value Resolution||NOTOURBUG Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Hi Christian, Le 09/01/12 16:34, Christian Lohmaier a écrit : Yes, and that's why I wrote it is required for release-builds. But unless you publish your LibreOffice SDK/ODK package for download, then you are free to build the ODK without generated documentation. So when you build you can: * skip building the SDK/ODK altogether: --disable-odk (that's what most devs will use, along --disable-binfilter) * build the SDK/ODK, but without generated documentation: --without-doxygen The resulting package is perfectly fine for your personal use and will work to develop extensions, but doesn't contain the html-documentation and hence not suitable for distribution. * build the SDK/ODK with the generated documentation: Only this requires doxygen installed on the buildsystem. An extension developer doesn't need to build LibreOffice - he/she can just download the SDK from www.libreoffice.org and won't need doxygen. ciao Christian Thanks for that information. If I understand correctly, it means that if I want to keep on distributing the mysql connector extension on the extensions site with any associated documentation, then I need to install doxygen. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Updating Italian dictionaries
On 05/01/2012 Andrea Pescetti wrote: On 05/01/2012 Andras Timar wrote: Why would you like to pack and distribute files from the legacy folder? Those look useless to end users. Because they allow to see who contributed what and when. They are indeed of little interest for end users (and the contributors' names, just the names, are of course already listed in the README files), but it was a specific request I received from previous contributors and it would be fair to them to respect their wishes. Also, this allows to build a complete genealogy of the project, which is better now that we have to maintain it in multiple repositories. I see that on the same day I wrote this (I didn't check if earlier or later) an incomplete update of dictionaries was done. While data are probably OK, I would prefer that the update it is completed according to my original mail, so that users won't be confused (thanks to the new CHANGELOG and README) and that anyone wishing to create derivatives of the package or its portions can easily find all history in the documentation in the legacy folder (and the will of earlier contributors is respected). The incomplete update has been ported to the 3.5 branch too, if I see correctly, so it would be nice to complete it there too. Thanks, Andrea. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Le 09/01/12 17:40, Norbert Thiebaud a écrit : Hi Norbert, FYI: binary of doxygen for acOSX are available here: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc after install (assuming a standard drag-and-drop in Applications) sudo ln -s /Applications/Doxygen.app/Contents/Reources/doxygen /usr/local/bin/doxygen and you're all set :-) Thanks for the tips, I had downloaded it already, but not yet installed it. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
Le 09/01/12 17:42, Christian Lohmaier a écrit : Hi Christian, No, you misunderstood. You don't need to install doxygen if you only want to provide extensions. If you want to build offer the LO SDK itself for download, then (and only then) you need it. Ah, OK, sorry, I was a bit confused with what the different requirements were between the ODK and SDK. Thanks for clearing that up. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 36681, which changed state. Bug 36681 Summary: EDITING: after inserting a picture view scrolls to end of document https://bugs.freedesktop.org/show_bug.cgi?id=36681 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH core] Remove cruft in debug tools.
Hello lo-devs,
the define SV_MEMMGR in tools/source/debug/debug.cxx was commented
out since 2001 and all of the memory related debugging code
depends on this define. These patches removes all of the depending
code. The ini configuration reader and writer for the debugging
configuration now simply ignore the memory block.
regards
Marcel Metz
---
sfx2/source/appl/appopen.cxx |6 -
sfx2/source/appl/appserv.cxx |4 -
sfx2/source/bastyp/bitset.cxx| 14 ---
sfx2/source/bastyp/minarray.cxx |9 --
sfx2/source/control/bindings.cxx | 22
sfx2/source/control/ctrlitem.cxx | 15 ---
sfx2/source/control/dispatch.cxx | 13 ---
sfx2/source/control/msgpool.cxx |7 --
sfx2/source/control/objface.cxx |4 -
sfx2/source/control/request.cxx | 13 ---
sfx2/source/control/statcach.cxx |6 -
sfx2/source/menu/mnuitem.cxx |8 --
sfx2/source/menu/mnumgr.cxx |5 -
sfx2/source/menu/virtmenu.cxx| 13 ---
sfx2/source/notify/hintpost.cxx |3 -
sfx2/source/statbar/stbitem.cxx |1 -
sfx2/source/toolbox/tbxitem.cxx |1 -
sfx2/source/view/viewfrm.cxx |3 -
tools/inc/tools/debug.hxx| 36 +--
tools/source/debug/debug.cxx | 75 +-
vcl/source/app/dbggui.cxx| 220
+-
21 files changed, 6 insertions(+), 472 deletions(-)
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ebb9749..e60c108 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -530,8 +530,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock xDoc, const String
void SfxApplication::NewDocDirectExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
String aFactName;
if ( pFactoryItem )
@@ -565,8 +563,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest rReq )
void SfxApplication::NewDocExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
// No Parameter from BASIC only Factory given?
SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
@@ -696,8 +692,6 @@ bool lcl_isFilterNativelySupported(const SfxFilter rFilter)
void SfxApplication::OpenDocExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
-
sal_uInt16 nSID = rReq.GetSlot();
SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
if ( pFileNameItem )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f6eb9ca..3ac3122 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -182,7 +182,6 @@ static void showDocument( const char* pBaseName )
void SfxApplication::MiscExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
bool bDone = false;
switch ( rReq.GetSlot() )
{
@@ -616,8 +615,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
void SfxApplication::MiscState_Impl(SfxItemSet rSet)
{
-DBG_MEMTEST();
-
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
const sal_uInt16 *pRanges = rSet.GetRanges();
DBG_ASSERT(pRanges *pRanges, Set without range);
@@ -886,7 +883,6 @@ static ::rtl::OUString getConfigurationStringValue(
void SfxApplication::OfaExec_Impl( SfxRequest rReq )
{
-DBG_MEMTEST();
switch ( rReq.GetSlot() )
{
case SID_OPTIONS_TREEDIALOG:
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 3c7bf60..1b5e750 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -38,7 +38,6 @@
BitSet BitSet::operator( sal_uInt16 nOffset ) const
{
-DBG_MEMTEST();
// create a work-copy, return it if nothing to shift
BitSet aSet(*this);
if ( nOffset == 0 )
@@ -89,7 +88,6 @@ BitSet BitSet::operator( sal_uInt16 nOffset ) const
BitSet BitSet::operator( sal_uInt16 ) const
{
-DBG_MEMTEST();
return BitSet();
}
@@ -99,12 +97,10 @@ BitSet BitSet::operator( sal_uInt16 ) const
void BitSet::CopyFrom( const BitSet rSet )
{
-DBG_MEMTEST();
nCount = rSet.nCount;
nBlocks = rSet.nBlocks;
if ( rSet.nBlocks )
{
-DBG_MEMTEST();
pBitmap = new sal_uIntPtr[nBlocks];
memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
}
@@ -118,7 +114,6 @@ void BitSet::CopyFrom( const BitSet rSet )
BitSet::BitSet()
{
-DBG_MEMTEST();
nCount = 0;
nBlocks = 0;
pBitmap = 0;
@@ -130,7 +125,6 @@ BitSet::BitSet()
BitSet::BitSet( const BitSet rOrig )
{
-DBG_MEMTEST();
CopyFrom(rOrig);
}
@@ -140,7 +134,6 @@ BitSet::BitSet( const BitSet rOrig )
BitSet::~BitSet()
{
-DBG_MEMTEST();
delete [] pBitmap;
}
@@ -150,7 +143,6 @@ BitSet::~BitSet()
BitSet BitSet::operator=( const BitSet rOrig )
{
-
[Libreoffice] [PATCH binfilter] Remove cruft in debug tools.
---
binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx | 10 --
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |6 --
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
index 9fcdce7..042eaa3 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
@@ -26,7 +26,6 @@
*
/
-#include tools/debug.hxx
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -42,7 +41,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator( USHORT nOffset ) const
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // create a work-copy, return it if nothing to shift
/*N*/ BitSet aSet(*this);
/*N*/ if ( nOffset == 0 )
@@ -97,12 +95,10 @@ namespace binfilter {
/*N*/ void BitSet::CopyFrom( const BitSet rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = rSet.nCount;
/*N*/ nBlocks = rSet.nBlocks;
/*N*/ if ( rSet.nBlocks )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ pBitmap = new ULONG[nBlocks];
/*N*/ memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
/*N*/ }
@@ -116,7 +112,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = 0;
/*N*/ nBlocks = 0;
/*N*/ pBitmap = 0;
@@ -128,7 +123,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet( const BitSet rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ CopyFrom(rOrig);
/*N*/ }
@@ -143,7 +137,6 @@ namespace binfilter {
/*N*/ BitSet::~BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pBitmap;
/*N*/ }
@@ -168,7 +161,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator-=(USHORT nBit)
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L (nBit % 32);
/*N*/
@@ -190,7 +182,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator|=( const BitSet rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMax = Min(nBlocks, rSet.nBlocks);
/*N*/
/*N*/ // expand the bitmap
@@ -227,7 +218,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator|=( USHORT nBit )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L (nBit % 32);
/*N*/
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bb2a1e5..366d692 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -40,7 +40,6 @@ namespace binfilter {
/*N*/ nGrow( nGrowSize ? nGrowSize : 1 ),
/*N*/ nUnused( nInitSize )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMSCBug = nInitSize;
/*N*/
/*N*/ if ( nMSCBug 0 )
@@ -53,7 +52,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::SfxPtrArr( const SfxPtrArr rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nUsed = rOrig.nUsed;
/*N*/ nGrow = rOrig.nGrow;
/*N*/ nUnused = rOrig.nUnused;
@@ -71,7 +69,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::~SfxPtrArr()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pData;
/*N*/ }
@@ -79,7 +76,6 @@ namespace binfilter {
/*N*/ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
/*N*/ nLen = Min( (USHORT)(nUsed-nPos), nLen );
/*N*/
@@ -133,7 +129,6 @@ namespace binfilter {
/*N*/ BOOL SfxPtrArr::Remove( void* aElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // einfache Aufgaben ...
/*N*/ if ( nUsed == 0 )
/*N*/ return FALSE;
@@ -153,7 +148,6 @@ namespace binfilter {
/*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ DBG_ASSERT( sal_Int32(nUsed+1) sal_Int32( USHRT_MAX / sizeof(void*) ), array too large );
/*N*/ // musz das Array umkopiert werden?
/*N*/ if ( nUnused == 0 )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] proposed fix for fdo#44533
julien2412 wrote: I attached a patch for fdo#44533 (SLIDESHOW: CRASH when play particular presentation with sound). I attached in the bugtracker the backtrace (https://bugs.freedesktop.org/attachment.cgi?id=55314) and console logs (https://bugs.freedesktop.org/attachment.cgi?id=55315) Thanks a lot, looks good pushed - and some review found a few other cases of dubious iterator reuse. Cheers, -- Thorsten pgpYujvZI0A8J.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] proposed fix for fdo#44533
julien2412 wrote: Thank you Thorsten for the extra check and the push/commit on master. Should it be pushed on 3.5 branch too or is it useless ? It should - just holding off for a round of tinderbox builds, especially for the win32-only changes. Will cherry-pick tomorrow. :) Cheers, -- Thorsten pgpBV9vrdvj2D.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] [PATCH 3.5 and master] Avoid UI bugs in translations
Hi Korrawit, For the choice buttons that are too small, IMHO this could be fixed by resizing them to be larger, if don't want to change the texts. :-) Hm, probably. Could you have a look, though, please, as these labels are already supposed to get wider automatically and don't use hard-coded numbers unlike most of our UI code. Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] [PATCH 3.5 and master] Avoid UI bugs in translations
2012/1/9 Stefan Knorr (Astron) heinzless...@googlemail.com: Hi Korrawit, For the choice buttons that are too small, IMHO this could be fixed by resizing them to be larger, if don't want to change the texts. :-) Hm, probably. Could you have a look, though, please, as these labels are already supposed to get wider automatically and don't use hard-coded numbers unlike most of our UI code. No, the second button was not resized automatically. Now it is fixed. http://cgit.freedesktop.org/libreoffice/core/commit/?id=2e0ec77cd6bbfe599d63f3a67218c1cf09bb19a6 In 3-5, too. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||40438 --- Comment #83 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-01-09 12:30:30 UTC --- Adding Bug 40438 - CRASH in OLE object EDITING -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
