[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

[Jürgen Schmidt]

 cui/source/dialogs/about.cxx   |   40 +---
 cui/source/dialogs/about.hrc   |   19 +++
 cui/source/dialogs/about.src   |   16 ++--
 cui/source/dialogs/makefile.mk |4 
 4 files changed, 66 insertions(+), 13 deletions(-)

New commits:
commit 11f657e989d677f53609af82f9002f50f064953e
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 05:53:21 2013 +

#122265# split resource string to get more flexibility and drop general 
copyright from translation, remains untranslated

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 3b586d0..7dfe13d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -28,6 +28,7 @@
 #include dialmgr.hxx
 #include osl/file.hxx
 #include rtl/bootstrap.hxx
+//#include rtl/ustrbuf.hxx
 #include sfx2/sfxcommands.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/sfxuno.hxx
@@ -279,15 +280,15 @@ namespace
 
 // ---
 
-AboutDialog::AboutDialog( Window* pParent, const ResId rId ) :
+AboutDialog::AboutDialog( Window* pParent, const ResId   rId ) :
 SfxModalDialog( pParent, rId ),
 maOKButton( this, ResId( RID_CUI_ABOUT_BTN_OK, *rId.GetResMgr() ) ),
 maReadmeButton( this, ResId( RID_CUI_ABOUT_BTN_README, *rId.GetResMgr() ) 
),
 maVersionText( this, ResId( RID_CUI_ABOUT_FTXT_VERSION, *rId.GetResMgr() ) 
),
 maBuildInfoEdit( this, ResId( RID_CUI_ABOUT_FTXT_BUILDDATA, 
*rId.GetResMgr() ) ),
 maCopyrightEdit( this, ResId( RID_CUI_ABOUT_FTXT_COPYRIGHT, 
*rId.GetResMgr() ) ),
-maCreditsLink( this, ResId( RID_CUI_ABOUT_FTXT_WELCOME_LINK, 
*rId.GetResMgr() )  ),
-maCopyrightTextStr( ResId( RID_CUI_ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) 
)
+maCreditsLink( this, ResId( RID_CUI_ABOUT_FTXT_WELCOME_LINK, 
*rId.GetResMgr() )  )
+//maCopyrightTextStr( ResId( RID_CUI_ABOUT_STR_COPYRIGHT, *rId.GetResMgr() 
) )
 {
 bool bLoad = vcl::ImageRepository::loadBrandingImage(
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(about)),
@@ -299,6 +300,39 @@ AboutDialog::AboutDialog( Window* pParent, const ResId 
rId ) :
 maMainLogo );
 OSL_ENSURE( bLoad, Can't load logo image);
 
+const String vendor( ResId( RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR, 
*rId.GetResMgr() ) );
+String createdRes( ResId( RID_CUI_ABOUT_STR_CREATED, *rId.GetResMgr() ) );
+if ( !vendor.EqualsAscii(Apache Software Foundation) ) {
+createdRes = String( ResId( RID_CUI_ABOUT_STR_CREATED_VENDOR, 
*rId.GetResMgr() ));
+}
+const String copyrightAcknowledge( ResId( RID_CUI_ABOUT_STR_ACKNOWLEDGE, 
*rId.GetResMgr() ) );
+
+rtl::OUStringBuffer sbcopyright(250);
+sbcopyright.appendAscii(Copyright );
+sbcopyright.append((sal_Unicode)0x00a9);
+sbcopyright.appendAscii( );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM(2013) );
+if (vendor.EqualsAscii(Apache Software Foundation)) {
+sbcopyright.append(sYear);
+sbcopyright.appendAscii( The Apache Software Foundation.\n\n);
+} else {
+#ifdef COPYRIGHT_YEAR
+const rtl::OUString sDefYear( RTL_CONSTASCII_USTRINGPARAM( STRINGIFY( 
COPYRIGHT_YEAR ) ) );
+if ( sDefYear.getLength()  0 )
+{
+sYear = sDefYear;
+}
+#endif
+sbcopyright.append(sYear);
+sbcopyright.appendAscii( );
+sbcopyright.append(vendor);
+sbcopyright.appendAscii(.\nPortion copyright The Apache Software 
Foundation.\n\n);
+}
+sbcopyright.append( createdRes );
+sbcopyright.appendAscii(\n\n);
+sbcopyright.append( copyrightAcknowledge );
+maCopyrightTextStr = sbcopyright.makeStringAndClear();
+
 InitControls();
 
 // set links
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index fa2cbfb..9944a58 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -28,12 +28,15 @@
 #define RID_CUI_ABOUT_FTXT_VERSION  3
 #define RID_CUI_ABOUT_FTXT_COPYRIGHT4
 #define RID_CUI_ABOUT_FTXT_BUILDDATA5
-#define RID_CUI_ABOUT_STR_COPYRIGHT 6
-#define RID_CUI_ABOUT_FTXT_WELCOME_LINK 7
+#define RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR  6
+#define RID_CUI_ABOUT_STR_CREATED   7
+#define RID_CUI_ABOUT_STR_CREATED_VENDOR8
+#define RID_CUI_ABOUT_STR_ACKNOWLEDGE   9
+#define RID_CUI_ABOUT_FTXT_WELCOME_LINK 10
 
-#define RID_CUI_README_TBCTL8
-#define RID_CUI_README_OKBTN9
-#define RID_CUI_READMEPAGE  10
-#define RID_CUI_LICENSEPAGE 11
-#define RID_CUI_NOTICEPAGE  12
-#define RID_CUI_README_TBPAGE_EDIT  13
+#define RID_CUI_README_TBCTL20
+#define RID_CUI_README_OKBTN21
+#define RID_CUI_READMEPAGE   

[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/data/columniterator.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6c53dff36ebdac7b6a6cf514ab469b2202d6aa48
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 09:08:31 2013 +0300

Bypass for now an OSL_ENSURE that doesn't compile

Change-Id: I8f6a74251cea70e7fd100e1ab233cf0033de4e50

diff --git a/sc/source/core/data/columniterator.cxx 
b/sc/source/core/data/columniterator.cxx
index 3380c0a..ec4b927 100644
--- a/sc/source/core/data/columniterator.cxx
+++ b/sc/source/core/data/columniterator.cxx
@@ -145,9 +145,11 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, 
SCROW nEndRow)
 void ScColumnTextWidthIterator::getDataIterators(size_t nOffsetInBlock)
 {
 OSL_ENSURE(miBlockCur != miBlockEnd, block is at end position);
+#if 0
+// Does not compile
 OSL_ENSURE(miBlockCur-type == sc::custom_celltextattr_block,
wrong block type - unsigned short block expected.);
-
+#endif
 miDataCur = sc::custom_celltextattr_block::begin(*miBlockCur-data);
 miDataEnd = sc::custom_celltextattr_block::end(*miBlockCur-data);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#64652 remove length restriction of Replace edit box

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3986

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3986/1

fdo#64652 remove length restriction of Replace edit box

Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f
---
M cui/source/tabpages/autocdlg.cxx
1 file changed, 0 insertions(+), 1 deletion(-)



diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48bd0c7..a99ec37 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -896,7 +896,6 @@
 
 aReplaceED.SetSpaces( sal_True );
 aShortED.SetSpaces( sal_True );
-aShortED.SetMaxTextLen( 30 );
 }
 
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()

-- 
To view, visit https://gerrit.libreoffice.org/3986
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#46553 Update embedded manifest on win32 builds to declar...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3987

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3987/1

fdo#46553 Update embedded manifest on win32 builds to declare dpiAware

Reviewed-on: https://gerrit.libreoffice.org/3981
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

Conflicts:

solenv/gbuild/platform/com_MSC_class.mk

Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
---
M solenv/gbuild/platform/com_MSC_class.mk
A solenv/inc/DeclareDPIAware.manifest
2 files changed, 8 insertions(+), 0 deletions(-)



diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index c965f2b..9adb9ff 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -152,6 +152,7 @@
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1)  false; 
fi) \
$(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
$(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+   $(if $(filter YES,$(TARGETGUI)),; if [ -f 
$(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo 
-manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 
; fi) \
; exit $$RC)
 endef
 
diff --git a/solenv/inc/DeclareDPIAware.manifest 
b/solenv/inc/DeclareDPIAware.manifest
new file mode 100644
index 000..bb01230
--- /dev/null
+++ b/solenv/inc/DeclareDPIAware.manifest
@@ -0,0 +1,7 @@
+assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 
xmlns:asmv3=urn:schemas-microsoft-com:asm.v3 
+  asmv3:application
+asmv3:windowsSettings 
xmlns=http://schemas.microsoft.com/SMI/2005/WindowsSettings;
+  dpiAwaretrue/dpiAware
+/asmv3:windowsSettings
+  /asmv3:application
+/assembly

-- 
To view, visit https://gerrit.libreoffice.org/3987
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] move DBG_UNHANDLED_EXCEPTION out of line

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3988

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3988/1

move DBG_UNHANDLED_EXCEPTION out of line

makes it easier to set a breakpoint on it.
Plus it's getting a little big to be a macro.

Change-Id: I2827aa3618ba966fbc85a4a56e0e794a55630730
---
M include/tools/diagnose_ex.h
M tools/source/debug/debug.cxx
2 files changed, 54 insertions(+), 39 deletions(-)



diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 261c0ae..a38b2d4 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -30,6 +30,8 @@
 #define OSL_UNUSED( expression ) \
 (void)(expression)
 
+
+
 #if OSL_DEBUG_LEVEL  0
 #include com/sun/star/configuration/CorruptedConfigurationException.hpp
 #include com/sun/star/task/ErrorCodeIOException.hpp
@@ -39,51 +41,15 @@
 #include boost/current_function.hpp
 #include typeinfo
 
+void DbgUnhandledException(const ::com::sun::star::uno::Any 
caughtException, const char* currentFunction);
+
 /** reports a caught UNO exception via OSL diagnostics
 
 Note that whenever you use this, it might be an indicator that your 
error
 handling is not correct 
 */
 #define DBG_UNHANDLED_EXCEPTION()   \
-::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); \
-OString sMessage( caught an exception! ); \
-sMessage += \nin function:; \
-sMessage += BOOST_CURRENT_FUNCTION; \
-sMessage += \ntype: ; \
-sMessage += OUStringToOString( caught.getValueTypeName(), 
osl_getThreadTextEncoding() ); \
-::com::sun::star::uno::Exception exception; \
-caught = exception; \
-if ( !exception.Message.isEmpty() ) \
-{ \
-sMessage += \nmessage: ; \
-sMessage += OUStringToOString( exception.Message, 
osl_getThreadTextEncoding() ); \
-} \
-if ( exception.Context.is() ) \
-{ \
-const char* pContext = typeid( *exception.Context.get() ).name(); \
-sMessage += \ncontext: ; \
-sMessage += pContext; \
-} \
-{ \
-::com::sun::star::configuration::CorruptedConfigurationException \
-specialized; \
-if ( caught = specialized ) \
-{ \
-sMessage += \ndetails: ; \
-sMessage += OUStringToOString( \
-specialized.Details, osl_getThreadTextEncoding() ); \
-} \
-} \
-{ \
-::com::sun::star::task::ErrorCodeIOException specialized; \
-if ( caught = specialized ) \
-{ \
-sMessage += \ndetails: ; \
-sMessage += OString::valueOf( specialized.ErrCode ); \
-} \
-} \
-sMessage += \n; \
-OSL_ENSURE( false, sMessage.getStr() )
+DbgUnhandledException( ::cppu::getCaughtException(), 
BOOST_CURRENT_FUNCTION);
 
 #else   // OSL_DEBUG_LEVEL
 #define DBG_UNHANDLED_EXCEPTION()
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 104353b..eec15eb 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -42,6 +42,7 @@
 #include vector
 
 #include osl/diagnose.h
+#include tools/diagnose_ex.h
 
 #ifdef DBG_UTIL
 
@@ -1585,4 +1586,52 @@
 
 #endif
 
+
+#if OSL_DEBUG_LEVEL  0
+
+void DbgUnhandledException(const css::uno::Any  caught, const char* 
currentFunction)
+{
+OString sMessage( caught an exception! );
+sMessage += \nin function:;
+sMessage += currentFunction;
+sMessage += \ntype: ;
+sMessage += OUStringToOString( caught.getValueTypeName(), 
osl_getThreadTextEncoding() );
+::com::sun::star::uno::Exception exception;
+caught = exception;
+if ( !exception.Message.isEmpty() )
+{
+sMessage += \nmessage: ;
+sMessage += OUStringToOString( exception.Message, 
osl_getThreadTextEncoding() );
+}
+if ( exception.Context.is() )
+{
+const char* pContext = typeid( *exception.Context.get() ).name();
+sMessage += \ncontext: ;
+sMessage += pContext;
+}
+{
+::com::sun::star::configuration::CorruptedConfigurationException
+specialized;
+if ( caught = specialized )
+{
+sMessage += \ndetails: ;
+sMessage += OUStringToOString(
+specialized.Details, osl_getThreadTextEncoding() );
+}
+}
+{
+::com::sun::star::task::ErrorCodeIOException specialized;
+if ( caught = specialized )
+{
+sMessage += \ndetails: ;
+sMessage += OString::valueOf( specialized.ErrCode );
+}
+}
+sMessage += \n;
+OSL_ENSURE( 

RE: fdo#59727 calc add-in functions and xlsx im/export

[Winfried Donkers]

Hi Eike,

A contribution to your post-vacation pile of mails...

 Let's postpone this. I'll be on vacation now anyway and couldn't investigate
 or help. I may have to take over when I return.

I'll leave the bug as it is, we'll communicate again when you're back and have 
time.

Winfried
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[UX advice] fdo#64626, changing borders of cells in calc

[Winfried Donkers]

Hi,

In calc one can place inner and outer borders on (a range of) cells.
The current behaviour is that one cannot remove these borders, unless all inner 
or outer borders are removed.

Example:
Select cell and put right, bottom, left and top borders around it. Now change 
that to top and bottom only. Nothing happens. Only when all outer (or inner) 
borders are removed, it has effect. The one exception I found is the 'standard 
option' in the cell laout dialog to have outer borders plus horizontal inner 
borders.

Having had a look at the code (/core/sc/source/core/data/attarray.cxx, 
ScAttrArray::ApplyFrame(...) and /core/sc/source/core/data/attarray.cxx, 
ApplyFrame(...)) it seems to me that the borders are only written when set and 
cannot be written when not set, except when no borders are set.

Is this behaviour intended behaviour, or is it a bug?
In the first case, IMHO we should put this in the help tekst for calc.
In the second case, it seems that I would have to add one or more functions to 
SvxBoxItem ( add a border line when not present, or add some sort of clear-flag 
for each border.

Any opinions?





Winfried


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions/source svx/source

[Jürgen Schmidt]

 extensions/source/preload/preload.src |4 ++--
 svx/source/dialog/docrecovery.src |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e66f9d91f3067703d5b41370d77d666ced1917e
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 07:18:12 2013 +

#122191# replace Oracle link with OpenOffice link, have to be checked if 
this is used at all

diff --git a/extensions/source/preload/preload.src 
b/extensions/source/preload/preload.src
index 2c234af..9bdd44d 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -86,8 +86,8 @@ TabPage RID_TP_WELCOME
 Text [ en-US ] = Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo 
start the %PRODUCTNAME %PRODUCTVERSION OEM, 
 please enter your personal data in the dialog following the license 
text. Important information is contained 
 in the readme files which are located in the %PRODUCTNAME product 
directory. Please read these files carefully. 
-You can also find detailed information at the Oracle website \n\n
-http://www.oracle.com/us/products/applications/open-office.;;
+You can also find detailed information at the OpenOffice website \n\n
+http://www.openoffice.org.;;
 };
 };
 
commit 62fa229f6bd4d93a572c1a5a3d4cc5022cb270fa
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 06:26:07 2013 +

#122191# correct privacy link

diff --git a/svx/source/dialog/docrecovery.src 
b/svx/source/dialog/docrecovery.src
index 772c593..f5049e8 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -371,7 +371,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME
 Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
 Size = MAP_APPFONT( RECOV_CONTROLWIDTH, 
(RECOV_ROW7-RECOV_ROW2-RSC_SP_CTRL_Y) );
 WordBreak = TRUE;
-Text[ en-US ] = This error report tool gathers information about how 
%PRODUCTNAME is working and sends it to Apache OpenOffice to help improve 
future versions.\n\nIt's easy - just send the report without any further effort 
on your part by clicking 'Send' in the next dialog, or you can briefly describe 
how the error occurred and then click 'Send'. If you want to see the report, 
click the 'Show Report' button. No data will be sent if you click 'Do Not 
Send'.\n\nCustomer Privacy\nThe information gathered is limited to data 
concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. 
Other information about passwords or document contents is not collected.\n\nThe 
information will only be used to improve the quality of %PRODUCTNAME and will 
not be shared with third parties.\nFor more information on Apache OpenOffice's 
privacy policy, visit\nwww.oracle.com/html/services-privacy-policy.html;
+Text[ en-US ] = This error report tool gathers information about how 
%PRODUCTNAME is working and sends it to Apache OpenOffice to help improve 
future versions.\n\nIt's easy - just send the report without any further effort 
on your part by clicking 'Send' in the next dialog, or you can briefly describe 
how the error occurred and then click 'Send'. If you want to see the report, 
click the 'Show Report' button. No data will be sent if you click 'Do Not 
Send'.\n\nCustomer Privacy\nThe information gathered is limited to data 
concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. 
Other information about passwords or document contents is not collected.\n\nThe 
information will only be used to improve the quality of %PRODUCTNAME and will 
not be shared with third parties.\nFor more information on Apache OpenOffice's 
privacy policy, visit\nhttp://www.openoffice.org/privacy.html;;
 };
 FixedLine FL_RECOV_BOTTOM
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Fix two SfxFilterMatcher_Impl memory leaks.

[Mark Wielaard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3989

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3989/1

Fix two SfxFilterMatcher_Impl memory leaks.

First SfxFilterMatcher_Impl::InitForIterating() will set pList to either
the global filter array matcher pFilterArr, or to a new SfxFilterList_Impl.
This new SfxFilterList_Impl should be deleted in the destructor.

Second getSfxFilterMatcher_Impl() keeps a cache of SfxFilterMatcher_Impls.
If a SfxFilterMatcher_Impl for a given name doesn't exist yet a new one
will be created. But the cache stored objects by service name (aName), but
looked object up by factory name (rName). So it always created a new
SfxFilterMatcher_Impl instead of using the one from the aImplArr cache.

Change-Id: I7840aaddc861f609fbe14d5b6c0ea20d997f690f
---
M sfx2/source/bastyp/fltfnc.cxx
1 file changed, 9 insertions(+), 1 deletion(-)



diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 8d9a70c..42477d0 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -255,6 +255,14 @@
 , pList(0)
 {
 }
+~SfxFilterMatcher_Impl()
+{
+// SfxFilterMatcher_Impl::InitForIterating() will set pList to
+// either the global filter array matcher pFilterArr, or to
+// a new SfxFilterList_Impl.
+if (pList != pFilterArr)
+delete pList;
+}
 };
 
 namespace
@@ -287,7 +295,7 @@
 // previously
 SfxFilterMatcherArr_Impl::iterator aEnd = aImplArr.end();
 SfxFilterMatcherArr_Impl::iterator aIter =
-std::find_if(aImplArr.begin(), aEnd, hasName(rName));
+std::find_if(aImplArr.begin(), aEnd, hasName(aName));
 if (aIter != aEnd)
 return *aIter;
 

-- 
To view, visit https://gerrit.libreoffice.org/3989
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7840aaddc861f609fbe14d5b6c0ea20d997f690f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_filters_test.mk svx/source writerfilter/qa

[Noel Grandin]

 sc/CppunitTest_sc_filters_test.mk  |1 
 svx/source/core/graphichelper.cxx  |   26 +
 writerfilter/qa/cppunittests/doctok/testdoctok.cxx |   18 +++---
 3 files changed, 17 insertions(+), 28 deletions(-)

New commits:
commit 895c1bcc811813ba32d865974b7172cb288074dc
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 10:12:31 2013 +0200

fdo#46808, fix unit test

...after my PrimitiveFactory2D  changes

Change-Id: I994d2dd0aebed67643f749dc43bcd4e744601885

diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index 28c56e6..56eb345 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -101,6 +101,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sc_filters_test,\
 sfx2/util/sfx \
 sot/util/sot \
 svl/util/svl \
+svx/util/svx \
 svtools/util/svt \
 toolkit/util/tk \
 ucb/source/core/ucb1 \
commit d5ac8a01b286051d417eb998f3d1b90b0bf492f6
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 09:58:13 2013 +0200

fdo#46808, Use service constructors

Change-Id: Ib428bb78751e9707c89dcf311b8ab86ad8184775

diff --git a/svx/source/core/graphichelper.cxx 
b/svx/source/core/graphichelper.cxx
index ff5bd61..fc8c2e4 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -31,19 +31,20 @@
 #include comphelper/anytostring.hxx
 #include comphelper/processfactory.hxx
 
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include com/sun/star/lang/XComponent.hpp
-#include com/sun/star/graphic/XGraphicProvider.hpp
-#include com/sun/star/graphic/GraphicType.hpp
-#include com/sun/star/ucb/XSimpleFileAccess2.hpp
 #include com/sun/star/beans/PropertyValues.hpp
 #include com/sun/star/beans/PropertyValue.hpp
+#include com/sun/star/document/XExporter.hpp
+#include com/sun/star/document/XFilter.hpp
+#include com/sun/star/drawing/GraphicExportFilter.hpp
+#include com/sun/star/graphic/XGraphicProvider.hpp
+#include com/sun/star/graphic/GraphicType.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/io/XInputStream.hpp
+#include com/sun/star/ucb/SimpleFileAccess.hpp
 #include com/sun/star/ui/dialogs/XFilePicker.hpp
 #include com/sun/star/ui/dialogs/XFilterManager.hpp
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
-#include com/sun/star/document/XExporter.hpp
-#include com/sun/star/document/XFilter.hpp
 
 using namespace css::uno;
 using namespace css::lang;
@@ -202,7 +203,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference 
drawing::XShape  xSha
 {
 try
 {
-Reference XMultiServiceFactory  xServiceFactory( 
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+Reference XComponentContext  xContext( 
::comphelper::getProcessComponentContext() );
 Reference XPropertySet  xShapeSet( xShape, UNO_QUERY_THROW );
 
 OUString aMimeType;
@@ -274,15 +275,12 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference 
drawing::XShape  xSha
 
 if( xGraphStream.is() )
 {
-OUString aSimpleFileAccessFilter( 
com.sun.star.ucb.SimpleFileAccess );
-ReferenceXSimpleFileAccess2 xFileAccess( 
xServiceFactory-createInstance( aSimpleFileAccessFilter ), UNO_QUERY_THROW );
+ReferenceXSimpleFileAccess3 xFileAccess = 
SimpleFileAccess::create( xContext );
 xFileAccess-writeFile( sPath, xGraphStream );
 }
 else
 {
-OUString 
aGraphicExportFilter(com.sun.star.drawing.GraphicExportFilter);
-ReferenceXExporter xGraphicExporter( 
xServiceFactory-createInstance( aGraphicExportFilter ), UNO_QUERY_THROW );
-ReferenceXFilter xFilter( xGraphicExporter, UNO_QUERY_THROW 
);
+Referencecss::drawing::XGraphicExportFilter xGraphicExporter 
= css::drawing::GraphicExportFilter::create( xContext );
 
 SequencePropertyValue aDescriptor( 2 );
 aDescriptor[0].Name = OUString(MediaType);
@@ -294,7 +292,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference 
drawing::XShape  xSha
 if ( xSourceDocument.is() )
 {
 xGraphicExporter-setSourceDocument( xSourceDocument );
-xFilter-filter( aDescriptor );
+xGraphicExporter-filter( aDescriptor );
 }
 }
 }
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx 
b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 837128b..e4a04f7 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -27,7 +27,7 @@
 #include cppunit/TestFixture.h
 #include cppunit/extensions/HelperMacros.h
 #include cppunit/plugin/TestPlugIn.h
-#include 

[Libreoffice-commits] core.git: dbaccess/source

[Petr Mladek]

 dbaccess/source/ui/dlg/generalpage.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 13df1b95e83a46e847311b49d4c14260cac682af
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 10:46:45 2013 +0200

allow to create new database using the wizard again (fdo#62937)

To be honest, I do not userstand the code much. Julien pointed out that
the setParentTitle and onTypeSelected were newer called. The condition
looked like an optimisation and it helped to remove it.

It would be great to put it back. It might be enough to hand the
intial values.

Change-Id: Id06cc9c63a9e578cb3c698c8526851fec71ef9da

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 6e72732..a881472 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -193,16 +193,12 @@ namespace dbaui
 {
 initializeTypeList();
 
-const OUString eOldSelection = m_eCurrentSelection;
-
 m_pDatasourceType-SelectEntry( getDatasourceName( _rSet ) );
 
 // notify our listener that our type selection has changed (if so)
-if ( eOldSelection != m_eCurrentSelection )
-{
-setParentTitle( m_eCurrentSelection );
-onTypeSelected( m_eCurrentSelection );
-}
+// FIXME: how to detect that it did not changed? (fdo#62937)
+setParentTitle( m_eCurrentSelection );
+onTypeSelected( m_eCurrentSelection );
 
 // a special message for the current page state
 switchMessage( m_eCurrentSelection );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Visual formula editor

[Miklos Vajna]

On Fri, May 17, 2013 at 09:47:06PM +0400, Ruslan Kabatsayev 
b7.10110...@gmail.com wrote:
 Is visual formula editor still being worked on?

Jonas created the visual formula editor feature -- and AFAIK he's not
actively working on it these days. OTOH, hopefully he can get you
started if you have specific questions. :-)


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Petr Mladek]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab6d2b7c96550a86c9b0052c5472028c12cc003d
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 11:07:43 2013 +0200

helpcontent2:  add missing auxiliary helpcontent files for bn-IN

Change-Id: I90e4eb02e2f4e672681ff8fe1305eaa08b1769fd

diff --git a/helpcontent2 b/helpcontent2
index 7cbed0a..cfcc328 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7cbed0ad307c87de550f032046a39375979efe76
+Subproject commit cfcc32824c195ca37339ef33c99a099f9b7afe1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git:

[Petr Mladek]

 0 files changed

New commits:
commit ada91eb7ea22015138185227c7831dd30968a173
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 11:00:27 2013 +0200

Updated core
Project: help  cfcc32824c195ca37339ef33c99a099f9b7afe1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/auxiliary

[Petr Mladek]

 source/auxiliary/bn-IN/default.css   |  108 ++
 source/auxiliary/bn-IN/highcontrast1.css |  109 +++
 source/auxiliary/bn-IN/highcontrast2.css |  109 +++
 source/auxiliary/bn-IN/highcontrastblack.css |  109 +++
 source/auxiliary/bn-IN/highcontrastwhite.css |  109 +++
 source/auxiliary/bn-IN/sbasic.cfg|   26 ++
 source/auxiliary/bn-IN/scalc.cfg |   26 ++
 source/auxiliary/bn-IN/schart.cfg|   26 ++
 source/auxiliary/bn-IN/sdatabase.cfg |   26 ++
 source/auxiliary/bn-IN/sdraw.cfg |   26 ++
 source/auxiliary/bn-IN/simpress.cfg  |   26 ++
 source/auxiliary/bn-IN/smath.cfg |   26 ++
 source/auxiliary/bn-IN/swriter.cfg   |   26 ++
 13 files changed, 752 insertions(+)

New commits:
commit cfcc32824c195ca37339ef33c99a099f9b7afe1e
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 11:00:27 2013 +0200

add missing auxiliary helpcontent files for bn-IN

Change-Id: Idbd5ddcef2a281fd568b93bca990de24e0b358ee

diff --git a/source/auxiliary/bn-IN/default.css 
b/source/auxiliary/bn-IN/default.css
new file mode 100644
index 000..f2d5efe
--- /dev/null
+++ b/source/auxiliary/bn-IN/default.css
@@ -0,0 +1,108 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/*
++
++  OPENOFFICE.ORG 2.0 HELP  +
++  DEFAULT STYLESHEET   +
++   WESTERN LANGUAGES   +
++
++ LAST CHANGES: 15-NOV-2004 +
++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, 
.tablecontentintable
+   { font-family: Mukti,MuktiNarrow,SolaimanLipi,Lohit 
Bengali,Vrinda,Albany AMT,Albany,Arial,Nimbus Sans L,Bitstream Vera 
Sans,Helvetica,Lucida,Geneva,Helmet,Andale Sans UI,Arial Unicode 
MS,Lucida Sans Unicode,Tahoma,sans-serif; }
+
+pre, .code, .codeintable, .example, .exampleintable, .literal, 
.literalintable, .path, .pathintable
+   { font-family: Mukti,MuktiNarrow,SolaimanLipi,Lohit 
Bengali,Vrinda,Cumberland AMT,Cumberland,Courier New,Nimbus Mono 
L,Bitstream Vera Sans Mono,Courier,Lucida Sans Typewriter,Lucida 
Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+   { font-weight: bold; }
+
+.related
+   { font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+   { font-weight: bold; }
+
+.tablehead, .tableheadintable
+   { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+   { font-weight: bold; border: 1px solid #99; background: #FF; 
padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+   { margin-bottom: 5pt; }
+
+p, td
+   { font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+   { font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; 
margin-bottom: 6px;}
+
+h2
+   { font-size: 14pt; }
+
+h3
+   { font-size: 12pt; }
+
+h4, h5, h6
+   { font-size: 10pt; }
+
+.relatedtopics
+   { font-weight: normal; }
+
+.relatedbody  
+   { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+   { background:#EE;}
+
+.howtogetbody
+   { background:#EE; margin: 0px;}
+
+.wide 
+   { width: 100%; }
+
+.topalign
+{ vertical-align: top; border: 1px;}
+
+.bug 
+   { color: red; border: 1px solid red;}
+
+.debug
+   { border: 1px solid black; padding: 3px; display: none;}
+
+/* Basic code syntax highlight */
+.identifier, .unknown
+   { color: green;}
+
+.keyword 
+   { color: blue;}
+
+.comment
+   { color: gray;}
+
+.number, .string
+   { color: red;}
+
+.operator, .parameter
+   { color: black;}
+
diff --git a/source/auxiliary/bn-IN/highcontrast1.css 
b/source/auxiliary/bn-IN/highcontrast1.css
new file mode 

mdds broken

[Stephan Bergmann]

Building recent master, at least on Fedora 18 with --enable-dbgutil, 
fails in various tests due to problems in mdds headers, likely since 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9785579ed0ec8e2e3e826c7e4cbbcaf51f8cb0d4 
Update mdds to 0.8.1.


I came up with the attached quick-hack workaround for the first problem 
encountered, but only to run into the next problem below in 
JunitTest_sc_unoapi soon after, so gave up.


Kohei, please fix these problems.

Stephan



/usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/debug/safe_iterator.h:493:
error: attempt to compare iterators from different sequences.

Objects involved in the operation:
iterator lhs @ 0x0x2aaad88af368 {
type = 
N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPPN4mdds17multi_type_vectorINS3_3mtv18custom_block_func1ILi51ENS5_21default_element_blockILi51EN2sc12CellTextAttrEE5blockENSt9__cxx19986vectorISE_SaISE_ENSt7__debug6vectorISE_SI_
 (mutable iterator);
  state = past-the-end;
  references sequence with type 
`NSt7__debug6vectorIPN4mdds17multi_type_vectorINS1_3mtv18custom_block_func1ILi51ENS3_21default_element_blockILi51EN2sc12CellTextAttrEE5blockESaISC_EEE'
 @ 0x0x2aaad88af368
}
iterator rhs @ 0x0x2aaacca5b3b0 {
type = 
N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPKPN4mdds17multi_type_vectorINS3_3mtv18custom_block_func1ILi51ENS5_21default_element_blockILi51EN2sc12CellTextAttrEE5blockENSt9__cxx19986vectorISE_SaISE_ENSt7__debug6vectorISE_SJ_
 (constant iterator);
  state = past-the-end;
  references sequence with type 
`NSt7__debug6vectorIPN4mdds17multi_type_vectorINS1_3mtv18custom_block_func1ILi51ENS3_21default_element_blockILi51EN2sc12CellTextAttrEE5blockESaISC_EEE'
 @ 0x0x2aaacca5b3b0
}



#13 signal handler called
#14 0x003c80635ba5 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
#15 0x003c80637358 in __GI_abort () at abort.c:90
#16 0x003c82eb193d in __gnu_debug::_Error_formatter::_M_error 
(this=0x2aaacca5b120) at ../../../../../libstdc++-v3/src/c++11/debug.cc:777
#17 0x2aaacd327a87 in __gnu_debug::operator==__gnu_cxx::__normal_iteratormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block**, 
std::__cxx1998::vectormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block*, 
std::allocatormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block*  , 
__gnu_cxx::__normal_iteratormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block* const*, 
std::__cxx1998::vectormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block*, 
std::allocatormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block*  , std::__debug::vectormdds::mu!

lti_type_v
ectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, sc::CellTextAttr  ::block*, 
std::allocatormdds::multi_type_vectormdds::mtv::custom_block_func151, mdds::mtv::default_element_block51, 
sc::CellTextAttr  ::block*   (__lhs=, __rhs=) at 
/usr/lib/gcc/x86_64-redhat-linux/4.7.2/../../../../include/c++/4.7.2/debug/safe_iterator.h:490

#18 0x2aaacd322697 in mdds::multi_type_vectormdds::mtv::custom_block_func151, 
mdds::mtv::default_element_block51, sc::CellTextAttr  ::get_block_position 
(this=0x2aaad87abbb0, pos_hint=..., pos=0, start_row=@0x2aaacca5b448: 0, 
block_index=@0x2aaacca5b440: 0) at 
workdir/unxlngx6/UnpackedTarball/mdds/include/mdds/multi_type_vector_def.inl:507
#19 0x2aaacd31da97 in mdds::multi_type_vectormdds::mtv::custom_block_func151, 
mdds::mtv::default_element_block51, sc::CellTextAttr  ::setsc::CellTextAttr 
(this=0x2aaad87abbb0, pos_hint=..., pos=0, value=...) at 
workdir/unxlngx6/UnpackedTarball/mdds/include/mdds/multi_type_vector_def.inl:209
#20 0x2aaacd317da7 in ScColumn::SetCell (this=0x2aaad87abbb0, 
rBlockPos=..., nRow=0, pNewCell=0x2aaafa5c91d0) at 
sc/source/core/data/column2.cxx:1508
#21 0x2aaacd333aa0 in ScColumn::Insert (this=0x2aaad87abbb0, rBlockPos=..., 
nRow=0, pNewCell=0x2aaafa5c91d0) at sc/source/core/data/column3.cxx:83
#22 0x2aaacd29bc02 in ScColumn::CopyToColumn (this=0x2aab64078cf0, 
rCxt=..., nRow1=0, nRow2=3, nFlags=255, bMarked=false, rColumn=..., 
pMarkData=0x2aaacca5c010, bAsLink=false) at sc/source/core/data/column.cxx:1466
#23 0x2aaacd29b6db in ScColumn::CopyToColumn (this=0x2aab64078cf0, 
rCxt=..., nRow1=0, nRow2=1048575, nFlags=255, bMarked=true, rColumn=..., 
pMarkData=0x2aaacca5c010, bAsLink=false) at sc/source/core/data/column.cxx:1386
#24 0x2aaacd5a8ec8 in ScTable::CopyToTable (this=0x2aab64078a60, rCxt=..., 
nCol1=0, nRow1=0, nCol2=1023, nRow2=1048575, nFlags=255, bMarked=true, 

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 62937, which changed state.

Bug 62937 Summary: incorrect/no progression from Database Wizard step 1
https://bugs.freedesktop.org/show_bug.cgi?id=62937

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Faisal M . Al-Otaibi]

 sc/source/ui/drawfunc/fuconstr.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 3661c3eb0124d6f4799fe7c4393d4576e1613bfb
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Wed May 15 08:51:26 2013 +0300

fdo#64011 fix the position and the drawing from left to right in RTL sheet

this will fix the start position for drawing and you can draw shapes
from left to right when the Sheet are RTL

Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
Reviewed-on: https://gerrit.libreoffice.org/3912
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/sc/source/ui/drawfunc/fuconstr.cxx 
b/sc/source/ui/drawfunc/fuconstr.cxx
index 5d8f270..381aeb4 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -83,6 +83,7 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point 
rInOutPos )
 // involved. Lets calculate where aPos would be at 100% zoom
 // that's the actual correct position for the object ( when you
 // restore the zoom.
+sal_Bool bNegative = pDoc-IsNegativePage(pView-GetTab());
 Rectangle aObjRect( rInOutPos, rInOutPos );
 ScRange aRange = pDoc-GetRange( pView-GetTab(), aObjRect );
 ScAddress aOldStt = aRange.aStart;
@@ -98,6 +99,12 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point 
rInOutPos )
 Point aOff = ( rInOutPos - aCurPosHmm );
 rInOutPos = aOldPos + aOff;
 aRetGridOff = aCurPosHmm - aOldPos;
+// fdo#64011 fix the X position when the sheet are RTL
+if ( bNegative )
+{
+aRetGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
+rInOutPos.setX( aOff.getX() - aOldPos.getX() );
+}
 }
 return aRetGridOff;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#64011 fix the position and the drawing from left to righ...

[Ahmad Harthi (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3912

Approvals:
  Ahmad Harthi: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3912
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/source

[Mark Wielaard]

 sfx2/source/bastyp/fltfnc.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit a6a8c379b20b4de7e8715057af4c1f6d020e55d2
Author: Mark Wielaard m...@klomp.org
Date:   Tue May 21 09:55:03 2013 +0200

Fix two SfxFilterMatcher_Impl memory leaks.

First SfxFilterMatcher_Impl::InitForIterating() will set pList to either
the global filter array matcher pFilterArr, or to a new SfxFilterList_Impl.
This new SfxFilterList_Impl should be deleted in the destructor.

Second getSfxFilterMatcher_Impl() keeps a cache of SfxFilterMatcher_Impls.
If a SfxFilterMatcher_Impl for a given name doesn't exist yet a new one
will be created. But the cache stored objects by service name (aName), but
looked object up by factory name (rName). So it always created a new
SfxFilterMatcher_Impl instead of using the one from the aImplArr cache.

Change-Id: I7840aaddc861f609fbe14d5b6c0ea20d997f690f
Reviewed-on: https://gerrit.libreoffice.org/3989
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 8d9a70c..42477d0 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -255,6 +255,14 @@ public:
 , pList(0)
 {
 }
+~SfxFilterMatcher_Impl()
+{
+// SfxFilterMatcher_Impl::InitForIterating() will set pList to
+// either the global filter array matcher pFilterArr, or to
+// a new SfxFilterList_Impl.
+if (pList != pFilterArr)
+delete pList;
+}
 };
 
 namespace
@@ -287,7 +295,7 @@ namespace
 // previously
 SfxFilterMatcherArr_Impl::iterator aEnd = aImplArr.end();
 SfxFilterMatcherArr_Impl::iterator aIter =
-std::find_if(aImplArr.begin(), aEnd, hasName(rName));
+std::find_if(aImplArr.begin(), aEnd, hasName(aName));
 if (aIter != aEnd)
 return *aIter;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Andras Timar]

 cui/source/tabpages/autocdlg.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 91820e31aad5e85e5a584c143e60694772f10ac5
Author: Andras Timar ati...@suse.com
Date:   Tue May 21 08:27:19 2013 +0200

fdo#64652 remove length restriction of Replace edit box

Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f
Reviewed-on: https://gerrit.libreoffice.org/3986
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48bd0c7..a99ec37 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -896,7 +896,6 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* 
pParent,
 
 aReplaceED.SetSpaces( sal_True );
 aShortED.SetSpaces( sal_True );
-aShortED.SetMaxTextLen( 30 );
 }
 
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild solenv/inc

[Andras Timar]

 solenv/gbuild/platform/com_MSC_class.mk |1 +
 solenv/inc/DeclareDPIAware.manifest |7 +++
 2 files changed, 8 insertions(+)

New commits:
commit c905068b9d3b7406d629728e01a5f9460521de8f
Author: Andras Timar ati...@suse.com
Date:   Mon May 20 20:30:04 2013 +0200

fdo#46553 Update embedded manifest on win32 builds to declare dpiAware

Reviewed-on: https://gerrit.libreoffice.org/3981
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

Conflicts:

solenv/gbuild/platform/com_MSC_class.mk

Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
Reviewed-on: https://gerrit.libreoffice.org/3987
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index c965f2b..9adb9ff 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -152,6 +152,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1)  false; 
fi) \
$(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
$(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+   $(if $(filter YES,$(TARGETGUI)),; if [ -f 
$(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo 
-manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 
; fi) \
; exit $$RC)
 endef
 
diff --git a/solenv/inc/DeclareDPIAware.manifest 
b/solenv/inc/DeclareDPIAware.manifest
new file mode 100644
index 000..bb01230
--- /dev/null
+++ b/solenv/inc/DeclareDPIAware.manifest
@@ -0,0 +1,7 @@
+assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 
xmlns:asmv3=urn:schemas-microsoft-com:asm.v3 
+  asmv3:application
+asmv3:windowsSettings 
xmlns=http://schemas.microsoft.com/SMI/2005/WindowsSettings;
+  dpiAwaretrue/dpiAware
+/asmv3:windowsSettings
+  /asmv3:application
+/assembly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy

[Isamu Mogi]

 dev/null |binary
 1 file changed

New commits:
commit 19ab0e5fc56ed26238895ee75e1e4f74d725afbd
Author: Isamu Mogi saturda...@gmail.com
Date:   Tue May 21 12:09:55 2013 +0900

Avoid pathological filename, breaking checkout on some systems.

This is a cherry-pick of 8cb45ee0b8d744c282b76be8b26b1196b9d91b44 .
Author: Andrea Pescetti pesce...@apache.org
Date:   Sat May 11 11:39:07 2013 +

Conflicts:
icon-themes/galaxy/svx/res/symphony/

Change-Id: I125e506531248c167cda20714228777e102a24e9
Reviewed-on: https://gerrit.libreoffice.org/3984
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/icon-themes/galaxy/svx/res/symphony/  
b/icon-themes/galaxy/svx/res/symphony/ 
deleted file mode 100755
index 263af5d..000
Binary files a/icon-themes/galaxy/svx/res/symphony/  and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy

[Isamu Mogi]

 icon-themes/galaxy/svx/res/symphony/_.png |binary
 1 file changed

New commits:
commit 2147d08c78604c0b5d16e507a2fd5e3aa2ee6ccd
Author: Isamu Mogi saturda...@gmail.com
Date:   Tue May 21 12:20:59 2013 +0900

Re-add PNG file that used to have a pathological (LF) filename

This is a cherry-pick of 4aa27cc3b98d455379f7c97a215d557d646fa08e .
Author: Andrea Pescetti pesce...@apache.org
Date:   Sat May 11 11:42:03 2013 +

Change-Id: Id91c9d5cd462e73a243d9c5670572a9c2293798e
Reviewed-on: https://gerrit.libreoffice.org/3985
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/icon-themes/galaxy/svx/res/symphony/_.png 
b/icon-themes/galaxy/svx/res/symphony/_.png
new file mode 100644
index 000..263af5d
Binary files /dev/null and b/icon-themes/galaxy/svx/res/symphony/_.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#64652 remove length restriction of Replace edit box

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3986

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3986
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Fix two SfxFilterMatcher_Impl memory leaks.

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3989

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3989
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7840aaddc861f609fbe14d5b6c0ea20d997f690f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#46553 Update embedded manifest on win32 builds to declar...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3987

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3987
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Re-add PNG file that used to have a pathological (LF) filena...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3985

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3985
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id91c9d5cd462e73a243d9c5670572a9c2293798e
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Avoid pathological filename, breaking checkout on some syste...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3984

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3984
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I125e506531248c167cda20714228777e102a24e9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: scp2/CustomTarget_langmacros.mk scp2/macros

[David Tardon]

 scp2/CustomTarget_langmacros.mk |1 +
 scp2/macros/macro.pl|   12 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 65d243296309acf39cde21f709240b7b6b23e093
Author: David Tardon dtar...@redhat.com
Date:   Tue May 21 11:50:25 2013 +0200

do not second-guess help langs for installation

Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c

diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 6e91b85..48cb596 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -16,6 +16,7 @@ $(call 
gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_Cust
 $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : 
$(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
$(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)'  \
+   export HELP_LANGS='$(gb_HELP_LANGS)'  \
$(PERL) $ -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \
)
 
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 1d5dd6c..696bdd8b 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -36,20 +36,13 @@ if ( !defined $completelangiso_var) {
 exit 1;
 }
 
-my $poorhelplocalizations_var = $ENV{WITH_POOR_HELP_LOCALIZATIONS};
-$poorhelplocalizations_var = $completelangiso_var if ( 
$poorhelplocalizations_var eq ALL );
-my %poorhelplocalizations;
-foreach $lang (split (/ /, $poorhelplocalizations_var)) {
-  next if ( $lang eq en-US);
-  $poorhelplocalizations{$lang}++;
-}
-
 if (!args_require_build()) {
 print STDERR No new languages, or config. Keeping old file\n;
 exit 0;
 }
 
 my @completelangiso = split  +, $completelangiso_var;
+my @helplangs = split  +, $ENV{HELP_LANGS};
 
 open OUTFILE, $outfile or die $0 ERROR: cannot open $outfile for 
writing!\n;
 
@@ -151,8 +144,7 @@ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
 {
 my $first = 1;
 print OUTFILE #define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) ;
-foreach $lang (@completelangiso) {
-next if ( $poorhelplocalizations{$lang} );
+foreach $lang (@helplangs) {
 print OUTFILE ; unless $first;
 $first = 0;
 print OUTFILE \\\n\tName ($lang) = 
EXTRAFILELISTNAME(HelpTarget/,name,/$lang);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools tools/source

[Noel Grandin]

 include/tools/diagnose_ex.h  |   44 --
 tools/source/debug/debug.cxx |   49 +++
 2 files changed, 54 insertions(+), 39 deletions(-)

New commits:
commit 863d38fbfa4fb4861e476828c46410602100919e
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 08:40:07 2013 +0200

move DBG_UNHANDLED_EXCEPTION out of line

makes it easier to set a breakpoint on it.
Plus it's getting a little big to be a macro.

Change-Id: I2827aa3618ba966fbc85a4a56e0e794a55630730
Reviewed-on: https://gerrit.libreoffice.org/3988
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 261c0ae..a38b2d4 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -30,6 +30,8 @@
 #define OSL_UNUSED( expression ) \
 (void)(expression)
 
+
+
 #if OSL_DEBUG_LEVEL  0
 #include com/sun/star/configuration/CorruptedConfigurationException.hpp
 #include com/sun/star/task/ErrorCodeIOException.hpp
@@ -39,51 +41,15 @@
 #include boost/current_function.hpp
 #include typeinfo
 
+void DbgUnhandledException(const ::com::sun::star::uno::Any 
caughtException, const char* currentFunction);
+
 /** reports a caught UNO exception via OSL diagnostics
 
 Note that whenever you use this, it might be an indicator that your 
error
 handling is not correct 
 */
 #define DBG_UNHANDLED_EXCEPTION()   \
-::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); \
-OString sMessage( caught an exception! ); \
-sMessage += \nin function:; \
-sMessage += BOOST_CURRENT_FUNCTION; \
-sMessage += \ntype: ; \
-sMessage += OUStringToOString( caught.getValueTypeName(), 
osl_getThreadTextEncoding() ); \
-::com::sun::star::uno::Exception exception; \
-caught = exception; \
-if ( !exception.Message.isEmpty() ) \
-{ \
-sMessage += \nmessage: ; \
-sMessage += OUStringToOString( exception.Message, 
osl_getThreadTextEncoding() ); \
-} \
-if ( exception.Context.is() ) \
-{ \
-const char* pContext = typeid( *exception.Context.get() ).name(); \
-sMessage += \ncontext: ; \
-sMessage += pContext; \
-} \
-{ \
-::com::sun::star::configuration::CorruptedConfigurationException \
-specialized; \
-if ( caught = specialized ) \
-{ \
-sMessage += \ndetails: ; \
-sMessage += OUStringToOString( \
-specialized.Details, osl_getThreadTextEncoding() ); \
-} \
-} \
-{ \
-::com::sun::star::task::ErrorCodeIOException specialized; \
-if ( caught = specialized ) \
-{ \
-sMessage += \ndetails: ; \
-sMessage += OString::valueOf( specialized.ErrCode ); \
-} \
-} \
-sMessage += \n; \
-OSL_ENSURE( false, sMessage.getStr() )
+DbgUnhandledException( ::cppu::getCaughtException(), 
BOOST_CURRENT_FUNCTION);
 
 #else   // OSL_DEBUG_LEVEL
 #define DBG_UNHANDLED_EXCEPTION()
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 104353b..eec15eb 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -42,6 +42,7 @@
 #include vector
 
 #include osl/diagnose.h
+#include tools/diagnose_ex.h
 
 #ifdef DBG_UTIL
 
@@ -1585,4 +1586,52 @@ void DbgOutf( const sal_Char*, ... ) {}
 
 #endif
 
+
+#if OSL_DEBUG_LEVEL  0
+
+void DbgUnhandledException(const css::uno::Any  caught, const char* 
currentFunction)
+{
+OString sMessage( caught an exception! );
+sMessage += \nin function:;
+sMessage += currentFunction;
+sMessage += \ntype: ;
+sMessage += OUStringToOString( caught.getValueTypeName(), 
osl_getThreadTextEncoding() );
+::com::sun::star::uno::Exception exception;
+caught = exception;
+if ( !exception.Message.isEmpty() )
+{
+sMessage += \nmessage: ;
+sMessage += OUStringToOString( exception.Message, 
osl_getThreadTextEncoding() );
+}
+if ( exception.Context.is() )
+{
+const char* pContext = typeid( *exception.Context.get() ).name();
+sMessage += \ncontext: ;
+sMessage += pContext;
+}
+{
+::com::sun::star::configuration::CorruptedConfigurationException
+specialized;
+if ( caught = specialized )
+{
+sMessage += \ndetails: ;
+sMessage += OUStringToOString(
+specialized.Details, osl_getThreadTextEncoding() );
+}
+}
+{
+

[PUSHED] move DBG_UNHANDLED_EXCEPTION out of line

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3988

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3988
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2827aa3618ba966fbc85a4a56e0e794a55630730
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Rodolfo Ribeiro Gomes]

 vcl/source/gdi/impimagetree.cxx |   65 +---
 1 file changed, 22 insertions(+), 43 deletions(-)

New commits:
commit a2c9d4f8bbde97f175bae4df771273a61251f402
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date:   Tue May 14 20:16:02 2013 -0300

Little cleanup in image loader internal functions

Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/3950
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 6e449de..ea7d7cf 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -64,13 +64,13 @@
 
 namespace {
 
-OUString createPath(
+static OUString createPath(
 OUString const  name, sal_Int32 pos, OUString const  locale)
 {
 return name.copy(0, pos + 1) + locale + name.copy(pos);
 }
 
-boost::shared_ptr SvStream  wrapFile(osl::File  file)
+static boost::shared_ptr SvStream  wrapFile(osl::File  file)
 {
 // This could use SvInputStream instead if that did not have a broken
 // SeekPos implementation for an XInputStream that is not also XSeekable
@@ -90,22 +90,7 @@ boost::shared_ptr SvStream  wrapFile(osl::File  file)
 return s;
 }
 
-void loadFromFile(
-osl::File  file,
-OUString const  path, BitmapEx  bitmap)
-{
-boost::shared_ptr SvStream  s(wrapFile(file));
-if (path.endsWith(.png))
-{
-vcl::PNGReader aPNGReader( *s );
-aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
-} else {
-*s  bitmap;
-}
-}
-
-boost::shared_ptr SvStream  wrapStream(
+static boost::shared_ptr SvStream  wrapStream(
 css::uno::Reference css::io::XInputStream  const  stream)
 {
 // This could use SvInputStream instead if that did not have a broken
@@ -127,18 +112,17 @@ boost::shared_ptr SvStream  wrapStream(
 return s;
 }
 
-void loadFromStream(
-css::uno::Reference css::io::XInputStream  const  stream,
-OUString const  path, BitmapEx  bitmap)
+static void loadImageFromStream(
+boost::shared_ptr SvStream  pStream,
+OUString const  rPath, BitmapEx  rBitmap)
 {
-boost::shared_ptr SvStream  s(wrapStream(stream));
-if (path.endsWith(.png))
+if (rPath.endsWith(.png))
 {
-vcl::PNGReader aPNGReader( *s );
+vcl::PNGReader aPNGReader( *pStream );
 aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
+rBitmap = aPNGReader.Read();
 } else {
-*s  bitmap;
+*pStream  rBitmap;
 }
 }
 
@@ -271,27 +255,22 @@ void ImplImageTree::setStyle(OUString const  style) {
 
 void ImplImageTree::resetPaths() {
 m_paths.clear();
+
+OUString url( $BRAND_BASE_DIR/share/config/ );
+rtl::Bootstrap::expandMacros(url);
+if ( m_style != default )
 {
-OUString url(
-$BRAND_BASE_DIR/share/config);
-rtl::Bootstrap::expandMacros(url);
 INetURLObject u(url);
 OSL_ASSERT(!u.HasError());
 bool ok = u.Append(images_ + m_style, INetURLObject::ENCODE_ALL);
 OSL_ASSERT(ok); (void) ok;
-m_paths.push_back(
-std::make_pair(
-u.GetMainURL(INetURLObject::NO_DECODE),
-css::uno::Reference css::container::XNameAccess ()));
-}
-if ( m_style == default )
-{
-OUString url( $BRAND_BASE_DIR/share/config/images);
-rtl::Bootstrap::expandMacros(url);
-m_paths.push_back(
-std::make_pair(
-url, css::uno::Reference css::container::XNameAccess ()));
+url = u.GetMainURL(INetURLObject::NO_DECODE);
 }
+else
+url += images;
+m_paths.push_back(
+std::make_pair(
+url, css::uno::Reference css::container::XNameAccess ()));
 }
 
 bool ImplImageTree::checkStyleCacheLookup(
@@ -329,7 +308,7 @@ bool ImplImageTree::find(
 {
 osl::File file(i-first + / + *j);
 if (file.open(osl_File_OpenFlag_Read) == 
::osl::FileBase::E_None) {
-loadFromFile(file, *j, bitmap);
+loadImageFromStream( wrapFile(file), *j, bitmap );
 file.close();
 return true;
 }
@@ -361,7 +340,7 @@ bool ImplImageTree::find(
 css::uno::Reference css::io::XInputStream  s;
 bool ok = i-second-getByName(*j) = s;
 OSL_ASSERT(ok); (void) ok;
-loadFromStream(s, *j, bitmap);
+loadImageFromStream( wrapStream(s), *j, bitmap );
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source sfx2/source

[Andre Fischer]

 sd/source/ui/sidebar/LayoutMenu.cxx  |1 
 sd/source/ui/view/drviews1.cxx   |3 +
 sd/source/ui/view/drviewsa.cxx   |2 
 sfx2/source/sidebar/SidebarController.cxx|   63 +--
 sfx2/source/sidebar/SidebarController.hxx|6 --
 sfx2/source/sidebar/SidebarDockingWindow.cxx |2 
 sfx2/source/sidebar/TabBar.cxx   |   26 ---
 sfx2/source/sidebar/TabBar.hxx   |   13 -
 8 files changed, 60 insertions(+), 56 deletions(-)

New commits:
commit d8b17867f3c58d5623cca129d6459bae0eb11729
Author: Andre Fischer a...@apache.org
Date:   Tue May 21 09:46:08 2013 +

i122336: Show docked tab bar after closing undocked sidebar.

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1b6dcd8..b6b56a1 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -98,8 +98,8 @@ sal_Bool SidebarDockingWindow::Close (void)
 {
 // Do not close the floating window.
 // Dock it and close just the deck instead.
-mpSidebarController-RequestCloseDeck();
 SetFloatingMode(sal_False);
+mpSidebarController-RequestCloseDeck();
 mpSidebarController-NotifyResize();
 return sal_False;
 }
commit b89784c822670593cb253bcc0d260b93c9936e1c
Author: Andre Fischer a...@apache.org
Date:   Tue May 21 09:22:27 2013 +

i122291: Showing the right set of layouts for handout mode.  Fixed painting 
selection in layout panel.

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index dd26a07..2aac13f 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -816,6 +816,7 @@ void LayoutMenu::UpdateSelection (void)
 break;
 
 // Find the entry of the menu for to the layout.
+SetNoSelection();
 sal_uInt16 nItemCount (GetItemCount());
 for (sal_uInt16 nId=1; nId=nItemCount; nId++)
 {
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 615063f..4bc9851 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -519,6 +519,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 
 if (meEditMode == EM_PAGE)
 
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
 else
 
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 }
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1410116..8cb2297 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -158,6 +158,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, 
ViewShellBase rViewShellBas
 
 if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE)
 
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
 else
 
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 }
commit b27563ac5988d7ce407b045466e952114f54e07c
Author: Andre Fischer a...@apache.org
Date:   Tue May 21 08:49:40 2013 +

i122352: Do not allow selection of disabled decks via menu.

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index a6a4d73..0078418 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -110,7 +110,7 @@ SidebarController::SidebarController (
   mpParentWindow,
   rxFrame,
   ::boost::bind(SidebarController::OpenThenSwitchToDeck, this, 
_1),
-  ::boost::bind(SidebarController::ShowPopupMenu, this, 
_1,_2,_3))),
+  ::boost::bind(SidebarController::ShowPopupMenu, this, _1,_2))),
   mxFrame(rxFrame),
   maCurrentContext(OUString(), OUString()),
   maRequestedContext(),
@@ -802,10 +802,9 @@ IMPL_LINK(SidebarController, WindowEventHandler, 
VclWindowEvent*, pEvent)
 
 void SidebarController::ShowPopupMenu (
 const Rectangle rButtonBox,
-const ::std::vectorTabBar::DeckMenuData rDeckSelectionData,
-const ::std::vectorTabBar::DeckMenuData rDeckShowData) const
+const ::std::vectorTabBar::DeckMenuData rMenuData) const
 {
-::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rDeckSelectionData, 
rDeckShowData);
+::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rMenuData);
 

Re: Visual formula editor

[Jonas Finnemann Jensen]

Hi,

As Miklos says, I'm not actively working on the starmath module anymore...
But feel free to CC me on any questions/problems you run into.
I'm still on the mailing-list but I don't manage to read
everything/anything, so CC me if you want to reach me.

Has there in fact been any discussion on how these things should feel
 like? Or is there any documentation about this?

I had some ideas about things I wanted to do:
http://cgit.freedesktop.org/libreoffice/core/tree/starmath/visual-editor-todo
But I'd imagine any improvements are welcome.

The experimental formula editor is quite complicated because the abstract
syntax tree it operates on is more concrete than abstract.
In order to observe how the formula object tree looks and is changed, you
might want to take a look at:
http://cgit.freedesktop.org/libreoffice/core/tree/starmath/workben/smath-dump-watch.sh


 Also, could someone give some pointers on where all this stuff is
 located in the code?

Key input is handled in
http://cgit.freedesktop.org/libreoffice/core/tree/starmath/source/view.cxx#n422
When handling key input an instance of SmCursor is used to modify the tree,
SmCursor is defined in:
http://cgit.freedesktop.org/libreoffice/core/tree/starmath/source/cursor.cxx

You can get an overview of how the visual formula editor works from my
presentation at OpenSuSE conference 2010:
http://jonasfj.dk/downloads/GSoC2010/slide-osc10.pdf

WARNING:
The visual formula editor is quite complicated, in fact over complicated.
As I said before this is a result of the abstract syntax tree not being
very abstract.
Ideally, I think the nodes that make up the formula object tree should be
refactored.
If you look at my slides you'll see that a line in the formula editor is
not a list of elements,
but a tree consisting of binary operator nodes. So when editing a line, it
is parsed into a LineList
which is a list of elements. Then the LineList is modified and a tree
consisting of binary operator nodes
is constructed from it.
This is quite horrible, ideally, a line should be a single node consisting
of a list of elements.
But refactoring this seemed quite scary to me at the time...


--
Regards Jonas Finnemann Jensen.


On Tue, May 21, 2013 at 11:00 AM, Miklos Vajna vmik...@suse.cz wrote:

 On Fri, May 17, 2013 at 09:47:06PM +0400, Ruslan Kabatsayev 
 b7.10110...@gmail.com wrote:
  Is visual formula editor still being worked on?

 Jonas created the visual formula editor feature -- and AFAIK he's not
 actively working on it these days. OTOH, hopefully he can get you
 started if you have specific questions. :-)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Little cleanup in image loader internal functions

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3950

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3950
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-1'

[Petr Mladek]

New branch 'libreoffice-4-1' available with the following commits:
commit 04713bee714f746dd599e5ef81b783e17e7d57b2
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 12:25:20 2013 +0200

Branch libreoffice-4-1

This is 'libreoffice-4-1' - the stable branch for the 4.1.x releases.
The commit rules are different according to the development phase:

+ 4.1.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.1.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I0419256a7a92f72d61ddf17636cae4fa58173446

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-1'

[Petr Mladek]

New branch 'libreoffice-4-1' available with the following commits:
commit 24c84661cc2eb4515fa6f6876d4a47b0f212c035
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 12:25:20 2013 +0200

Branch libreoffice-4-1

This is 'libreoffice-4-1' - the stable branch for the 4.1.x releases.
The commit rules are different according to the development phase:

+ 4.1.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.1.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I60f2181aaa615022163ed0acad856689df533606

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-1'

[Petr Mladek]

New branch 'libreoffice-4-1' available with the following commits:
commit aca7d4c043342f9ccf86215e1949543e92faf00b
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 12:25:20 2013 +0200

Branch libreoffice-4-1

This is 'libreoffice-4-1' - the stable branch for the 4.1.x releases.
The commit rules are different according to the development phase:

+ 4.1.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.1.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I876057852d666fc6e272ea94b726f5bcdfa3ba11

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-1'

[Petr Mladek]

New branch 'libreoffice-4-1' available with the following commits:
commit 923e81c6b5a9f7eddf7138cffc44d802a883c72d
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 12:25:27 2013 +0200

Branch libreoffice-4-1

This is 'libreoffice-4-1' - the stable branch for the 4.1.x releases.
The commit rules are different according to the development phase:

+ 4.1.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 4.1.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: Idcf54b9239d25f17e3d85d08c72138142e5d1f00

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4-1-branch-point'

[Caolán McNamara]

Tag 'libreoffice-4-1-branch-point' created by Petr Mladek pmla...@suse.cz at 
2013-05-21 11:42 -0700

Tag libreoffice-4-1-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRm0+lAAoJEPQ0oe+v7q6jygQP/AiG1HGSa7MMDnub8T8Bg93i
4aO/rzSLEWXWKrR+RctMp1isr72ENGfiLerw9L1aKO5giH44DCIFBcct52PEZCy4
ZZipP8iJ6lGUb+SFFuBupJKq03Vd8EJccvh+3uO/MHxG/pzKxH6mbXFXMTuWPZ25
7sbNuiSp/EPbRej6BIvmZR90owzmQ4qKXOa/rpTkP55l/Zkh6RNO5waoDVvWb8ZR
igdZwd4wIlSK6UTKcXr4ndj6FUYoUtfQFMCevC4L0lRkCh5U3dhHpUNFTs13f5zS
0it8MnGvTVRuZaaAiSpcfOOaRQaktJj9CresmPmL5ZGeIbPR6M4+RECCfhPpbAbE
bYNgA2581T3KkUaX9mOTe0TWx0OpSyUlLrZhMqrZEg6Ft4LdOfGdswrqdcgipOsk
DtGcewtZutTRm7LY0Xr7O1lM7k/qNiSiPUHOR9iwLKscmFZymWbIUoKJihLpijZG
uDCYHA1uVc80SoVs6P52TTcsAYlN7AU4qp9JGtsk1XB69S5gNciUnK+0FBu9HRY/
NzDinT6v6tfiJiITy1Zc5M9F+h7tcdO6JbOXA5LnP2U1YqHa2W2HmToEzX1Kc5Bn
VwW/GOWzFOnfAlLOz/4pT8hAB+G5/1A4w8LVtC9/hSyG9QrSK4LSQq753fm8y6BZ
RS2WM0gIL64zQckfZQCN
=7o+G
-END PGP SIGNATURE-

Changes since libreoffice-4-0-branch-point-36:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4-1-branch-point'

[Petr Mladek]

Tag 'libreoffice-4-1-branch-point' created by Petr Mladek pmla...@suse.cz at 
2013-05-21 11:42 -0700

Tag libreoffice-4-1-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRm0+lAAoJEPQ0oe+v7q6jtvEP/3ZFTigc19ZoV6WQWMzLjw5G
AzjjxOHjMRPpolE53Y2q00W6e2FAemg0J2X0SzmgkOjgBQemnNIEn8kjumQxvVE1
ZmjK/iKLQj5GE+KfFZEofcrtDFKv6WbQvxYPmwCITRtycxIUKg5GsBUaJGHB6ZZc
2p4JS2xBLFA7KVcqTxAmGRUmElTuTQjVa0EU93dqzbxH2MOfjdzo9bWrk0ykrks3
vV0KzV7M+ph0fv+L4enpNgR5SsiRpn7uSKlnQidIg4PxUR9Tfc4K73bVc61K6fr4
2w7SWRy26qkxFxU1TBa4+YAlmrt+8arLix1t+lZfSGNGY0JcjcjjZgMu/f+3hPI3
Cy3D3fmFCOQUpDFVSGNQ/XtiPHmDGWHNmcj+HkJg2FMRrSBEoChXn7u3TkSl3iNl
4u5V+z4wZT0vcW/vrWO00dKeGMJvDTGJrxcs/26h3ax8oJb2Khb7aOp/eKLjkeEt
JKvuQeWOXf9/277Y34lACtTf7GJJXdfO0+SRN+vB8PTceLEgIg8rD7OJu4UU+i4V
dKZk6f2bD8PVy5VE6qtiZ+RjI+0eAHI1lGGtfgKG86oMqklyGeUlIuhS2UhLx+TJ
ZGWH4dmbH3dvI+I/nJLlprc++djfvsq/HlpRhr3hGrBiQXNJfhDQ8zr4lxJT+9TT
oFLCz87lOL3t9StI4R6d
=ZUnp
-END PGP SIGNATURE-

Changes since libreoffice-4-0-branch-point-196:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4-1-branch-point'

[Andras Timar]

Tag 'libreoffice-4-1-branch-point' created by Petr Mladek pmla...@suse.cz at 
2013-05-21 11:42 -0700

Tag libreoffice-4-1-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRm0+lAAoJEPQ0oe+v7q6jag8P/2IY0TY89oHYUdxeN2t2FQYs
duLT2dshpervHGHDax++VIvuR0Z2dmqoOP5sFyUFYuKVf7lxiDwVkj6DnNvlM6Sn
CzkQmxOBIlF4eVCnqSxfY5Zc/yU/hqADK9divUBtVIzhhi+GxNoTQBXIESXZ8xZs
r2b4kODCD5qWZ4y90oAqogG09O3YaAV1XSAnZSwVk/O7oZ262l5Sbes+EpLULKWc
a85HCIQ0acebJZDFujUz3ZqfCosGCOH244L+CUbtoBx7UfzJiMJ2bMpatS/p9kf1
vwUUenFOJUe4aWk8JGzJsDZiJArgrrGj6EodF8yGO7gb/SZk0HUMHgSTOelVpXO6
qZ0K+O9OJS3yjpkAQyfk6bLEpqGmVNuhXPJRoXURFOCD25TXPePxOt8Xd9DZnq2W
4C5dkKi1FK9tz8dMESktJcXv1d1nxuf0fgpToMEtKrbU3InLIeycL/7Ec9HZt+nO
CqgjRD51+ashcrCXiO6yipQrtpQmB1lWg6FKRWusPE3e2MmjVUCbI29BJqHe1kI0
2Eje2eF72+RYXXzC0MUkF2N6Vq31Pi+6HjE+1/ZKgPxDDodVwBbSa4reqyLHQIC6
ICJbFMWYd/H3qsD6PvtrLAMKtpTE6LGWYmUG3LMdmjOMnU2a3yzRsDYwME8OQcfJ
5IvXtcAx+56aGO8rn2Lq
=GFQO
-END PGP SIGNATURE-

Changes since libreoffice-4-0-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-1-branch-point'

[Rodolfo Ribeiro Gomes]

Tag 'libreoffice-4-1-branch-point' created by Petr Mladek pmla...@suse.cz at 
2013-05-21 11:42 -0700

Tag libreoffice-4-1-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRm0+lAAoJEPQ0oe+v7q6jRW0P/j27uSMEZvtUvncQTs2cgxNb
f+F07hSYINR6X03DerTaqozW1oBAMB0mc4mLCBmlu0aHP5Acor8fCQQ4KOm9xZl/
B7ybtrIXfFzvPgVG3pb/mQmBveg5HQqHCqBT+v9n+NtOxcl6ST6nB+jtIH2hOXGL
UAXib+UXG5mVan4es5OXZJEEr+TQo8l4XAzBR4PnGaLE/0jhlnBpyvHMn+lfiskO
jTds1ZR/j3P+6fSVLMKTGXl0pppJrKp8p9ZUXYJBpW20Gk1Gnj2i8nSSL4gaaGcv
P7QcgmAZ3SV2YnAHi4O2iFP50/dBvnaf4xC2Avec0hCN3hAcLa49hKefH2ESxNqm
ctONYVJqzrOQFOKb6IVh+C3wZ0wE3p1Gz/8QFwqjJEAmXqW6fM1uDG8kQsqB/gr0
ga3xKrWYCoCFkSUyPknr6IvhOBABLVUhaKijlUAMXMWVWiNKvsTTwbUIXITecL4h
gx2HrOQ/z9/EXbkfA0L27P5YRawJREE3Wa+Etyj7Y8oaE9QufNDdxsF41e/jw125
UUMwcM8Lvlo82bTbD9eI4YIvgBlDZDHENYgvt4N8mXXUTeLYrJEtheNeI9AWoPbK
YeAVvRhz9lhIXabaAPgN5y8WpSE3Fmj3j5vCIRUCZQ3enJPyHPpvXwfYloJhxp2l
r8bM8+4s9oXVVpbcxau7
=48Vr
-END PGP SIGNATURE-

Changes since libreoffice-4-0-branch-point-10062:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] Branch libreoffice-4-1 created

[Petr Mladek]

Hi all,

as promised, we have created a branch for the stabilization of the
4.1.x releases, called 'libreoffice-4-1'. It is based on master, last
pull on May 21, 2013 at about 10am UTC:

commit a2c9d4f8bbde97f175bae4df771273a61251f402
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Little cleanup in image loader internal functions

See also the tag libreoffice-4-1-branch-point.

The following rules apply:

+ only bugfixes are allowed
+ no approval needed during beta phase until June 17, 2013
+ 1 approval needed during rc phase and upcoming bug fix releases
+ 3 approvals with different/no affiliation needed for late
  features

IMPORTANT: Every developer is responsible for pushing fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

   Please, help use to make stable and usable 4.1.0 release.
   Do not forget to push useful fixes to this branch.

   git cherry-pick commit-id is your friend :-)
 


The 'master' branch is used for 4.2 development and has the rules:

+ free commit; do your best to do not break build and
  functionality
+ any development allowed


For further information about the roadmap, please check

http://wiki.documentfoundation.org/ReleasePlan


Now, if you want to switch your clone to the libreoffice-4-1 branch,
do:

./g pull -r
./g checkout -b libreoffice-4-1 origin/libreoffice-4-1

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; ie. libreoffice-4-1 when you have switched to it.  This will
save you some git shouting at you.

Happy hacking,
Petr


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - download external/msvcp100 external/prj oowintool scp2/source

[Andras Timar]

 download |   14 -
 external/msvcp100/README_msvcX100.dll|2 
 external/prj/d.lst   |4 +
 oowintool|2 
 scp2/source/ooo/vc_redist.scp|   22 -
 scp2/source/winexplorerext/file_winexplorerext.scp   |   45 +++
 scp2/source/winexplorerext/module_winexplorerext.scp |6 ++
 7 files changed, 58 insertions(+), 37 deletions(-)

New commits:
commit b0a3cb212a2b53b2a6551b9c7f23355de7157e7c
Author: Andras Timar ati...@suse.com
Date:   Tue May 21 03:43:52 2013 -0700

make 64-bit shell extensions work, put 64-bit VC runtime in the same dir

Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is 
installed
to the system32 folder. Windows installer automatically replaces it to
SysWOW64. The problem is that this way 64-bit dlls end up in the wrong 
directory.
They conflict with the 32-bit dlls, and will not be installed. Therefore
64-bit shell extensions will not work, unless the 64-bit VC runtime is
installed from other source. It is not possible to install both 32-bit and
64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012.
For the 64-bit shell extensions, we can install the runtime dlls next to 
the files.

Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60

diff --git a/download b/download
index 985443c..a04d1f4 100755
--- a/download
+++ b/download
@@ -50,14 +50,9 @@ if [ $COM = MSC -a $CPUNAME = INTEL ]; then
 fi
 
 if [ $COM = MSC ]; then
-if [ $CPUNAME = INTEL ]; then
-ver=
-else
-ver=-64
-fi
 # use oowintool to copy CRT dlls and manifest
-if ! ./oowintool --msvc-copy-dlls$ver ./external/msvcp ; then
-   echo oowintool failed to copy CRT
+if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
+   echo oowintool failed to copy 64-bit CRT
exit 1
 fi
 
@@ -66,11 +61,6 @@ if [ $COM = MSC ]; then
echo oowintool failed to copy merge modules
exit 1
 fi
-if [ $CPUNAME = INTEL ]; then
-if ! ./oowintool --msvc-copy-msms-64 ./external/msm$VCVER ; then
-   echo WARNING: oowintool failed to copy x64 merge modules, 
installation will lack the 64-bit Explorer extension
-fi
-fi
 fi
 
 # Local Variables:
diff --git a/external/msvcp100/README_msvcX100.dll 
b/external/msvcp100/README_msvcX100.dll
index a1b0e73..ada64ed 100644
--- a/external/msvcp100/README_msvcX100.dll
+++ b/external/msvcp100/README_msvcX100.dll
@@ -1,2 +1,2 @@
-Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a
+Put 64-bit msvcp100.dll, msvcr100.dll in this directory for Windows builds 
using a
 VS 2010 / VC 10.0 compiler.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index a797a3e..479834f 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -40,6 +40,10 @@ mkdir: %_DEST%\inc\external\wine
 ..\msvcp90\msvcr90*.dll %_DEST%\bin
 ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
 ..\msvcp90\Microsoft.VC90.DebugCRT.manifest 
%_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
+..\msvcp100\msvcp100*.dll %_DEST%\bin
+..\msvcp100\msvcr100*.dll %_DEST%\bin
+..\msvcp110\msvcp110*.dll %_DEST%\bin
+..\msvcp110\msvcr110*.dll %_DEST%\bin
 ..\msm90\*.msm %_DEST%\bin
 ..\msm100\*.msm %_DEST%\bin
 ..\msm110\*.msm %_DEST%\bin
diff --git a/oowintool b/oowintool
index 26221f0..6f5ab7c 100755
--- a/oowintool
+++ b/oowintool
@@ -313,7 +313,7 @@ sub msvc_copy_dlls($$)
 my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{'dll_path'});
 
-$srcdir =~ s/x86/amd64/ if ($arch eq 'amd64');
+$srcdir =~ s|/x86/|/x64/| if ($arch eq 'amd64');
 
 copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll,
   $dest . $ver-{'dll_suffix'});
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 283ba9c..82cd0d0 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -87,26 +87,4 @@ End
 
 #endif
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC100_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = (VC_REDIST=1) AND VersionNT64;
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC110_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = (VC_REDIST=1) AND VersionNT64;
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp 
b/scp2/source/winexplorerext/file_winexplorerext.scp
index f2a2a89..1aadacf 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -95,3 +95,48 @@ File gid_File_Lib_Shlxtmsi
 Dir = SCP2_OOO_BIN_DIR;
 Name = 

[Libreoffice-commits] core.git: configure.ac

[Petr Mladek]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 13c73a1b358934d7ffac6a6275c4e9d399b7d4eb
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 12:54:11 2013 +0200

bump product version to 4.2.0.0.alpha0+

Change-Id: I4e83df4ed18f224ce02565c32bdd3fb0c24c6d20

diff --git a/configure.ac b/configure.ac
index 10782ff..bb603a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] make 64-bit shell extensions work, put 64-bit VC runtime in ...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3990

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3990/1

make 64-bit shell extensions work, put 64-bit VC runtime in the same dir

Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed
to the system32 folder. Windows installer automatically replaces it to
SysWOW64. The problem is that this way 64-bit dlls end up in the wrong 
directory.
They conflict with the 32-bit dlls, and will not be installed. Therefore
64-bit shell extensions will not work, unless the 64-bit VC runtime is
installed from other source. It is not possible to install both 32-bit and
64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012.
For the 64-bit shell extensions, we can install the runtime dlls next to the 
files.

Conflicts:

scp2/source/ooo/vc_redist.scp

Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60
---
M download
M external/msvcp100/README_msvcX100.dll
M external/prj/d.lst
M oowintool
M scp2/source/ooo/vc_redist.scp
M scp2/source/winexplorerext/file_winexplorerext.scp
M scp2/source/winexplorerext/module_winexplorerext.scp
7 files changed, 58 insertions(+), 37 deletions(-)



diff --git a/download b/download
index 985443c..a04d1f4 100755
--- a/download
+++ b/download
@@ -50,14 +50,9 @@
 fi
 
 if [ $COM = MSC ]; then
-if [ $CPUNAME = INTEL ]; then
-ver=
-else
-ver=-64
-fi
 # use oowintool to copy CRT dlls and manifest
-if ! ./oowintool --msvc-copy-dlls$ver ./external/msvcp ; then
-   echo oowintool failed to copy CRT
+if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
+   echo oowintool failed to copy 64-bit CRT
exit 1
 fi
 
@@ -65,11 +60,6 @@
 if ! ./oowintool --msvc-copy-msms$ver ./external/msm$VCVER ; then
echo oowintool failed to copy merge modules
exit 1
-fi
-if [ $CPUNAME = INTEL ]; then
-if ! ./oowintool --msvc-copy-msms-64 ./external/msm$VCVER ; then
-   echo WARNING: oowintool failed to copy x64 merge modules, 
installation will lack the 64-bit Explorer extension
-fi
 fi
 fi
 
diff --git a/external/msvcp100/README_msvcX100.dll 
b/external/msvcp100/README_msvcX100.dll
index a1b0e73..ada64ed 100644
--- a/external/msvcp100/README_msvcX100.dll
+++ b/external/msvcp100/README_msvcX100.dll
@@ -1,2 +1,2 @@
-Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a
+Put 64-bit msvcp100.dll, msvcr100.dll in this directory for Windows builds 
using a
 VS 2010 / VC 10.0 compiler.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 7ee2582..c357edc 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,6 +36,10 @@
 ..\msvcp90\msvcr90*.dll %_DEST%\bin
 ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
 ..\msvcp90\Microsoft.VC90.DebugCRT.manifest 
%_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
+..\msvcp100\msvcp100*.dll %_DEST%\bin
+..\msvcp100\msvcr100*.dll %_DEST%\bin
+..\msvcp110\msvcp110*.dll %_DEST%\bin
+..\msvcp110\msvcr110*.dll %_DEST%\bin
 ..\msm90\*.msm %_DEST%\bin
 ..\msm100\*.msm %_DEST%\bin
 ..\msm110\*.msm %_DEST%\bin
diff --git a/oowintool b/oowintool
index 26221f0..6f5ab7c 100755
--- a/oowintool
+++ b/oowintool
@@ -313,7 +313,7 @@
 my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{'dll_path'});
 
-$srcdir =~ s/x86/amd64/ if ($arch eq 'amd64');
+$srcdir =~ s|/x86/|/x64/| if ($arch eq 'amd64');
 
 copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll,
   $dest . $ver-{'dll_suffix'});
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index fa7d1c2..82cd0d0 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -87,26 +87,4 @@
 
 #endif
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC100_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = VC_REDIST=1;
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC110_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = VC_REDIST=1;
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp 
b/scp2/source/winexplorerext/file_winexplorerext.scp
index f2a2a89..1aadacf 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -95,3 +95,48 @@
 Dir = SCP2_OOO_BIN_DIR;
 Name = shlxtmsi.dll;
 End
+
+#ifdef BUILD_X64
+
+#if defined(WITH_VC100_REDIST)
+
+File gid_File_Lib_Msvcr100
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = gid_Dir_Shlxthdl;
+Name = msvcr100.dll;
+ComponentCondition = VersionNT64;
+End
+
+File gid_File_Lib_Msvcp100
+LIB_FILE_BODY;
+Styles = (PACKED);
+Dir = 

[Libreoffice-commits] core.git: 6 commits - connectivity/Library_jdbc.mk connectivity/Library_mork.mk connectivity/Library_sdbc2.mk extensions/Library_log.mk include/oox include/tools offapi/com offap

[Noel Grandin]

 connectivity/Library_jdbc.mk  |1 
 connectivity/Library_mork.mk  |1 
 connectivity/Library_sdbc2.mk |1 
 extensions/Library_log.mk |1 
 include/oox/core/filterbase.hxx   |4 -
 include/tools/diagnose_ex.h   |3 -
 offapi/UnoApi_offapi.mk   |8 ++
 offapi/com/sun/star/chart2/ExponentialRegressionCurve.idl |   38 +
 offapi/com/sun/star/chart2/LinearRegressionCurve.idl  |   38 +
 offapi/com/sun/star/chart2/LogarithmicRegressionCurve.idl |   38 +
 offapi/com/sun/star/chart2/PotentialRegressionCurve.idl   |   38 +
 offapi/com/sun/star/oox/ExcelFilterExport.idl |   37 +
 offapi/com/sun/star/oox/PowerPointExport.idl  |   37 +
 oox/source/core/filterbase.cxx|   11 ---
 oox/source/core/xmlfilterbase.cxx |   14 +
 oox/source/drawingml/chart/converterbase.cxx  |6 +-
 oox/source/export/shapes.cxx  |5 +
 oox/source/ppt/pptimport.cxx  |   30 +-
 oox/source/ppt/timenode.cxx   |2 
 sc/inc/document.hxx   |4 -
 sc/source/core/data/documen2.cxx  |1 
 sc/source/core/data/documen6.cxx  |2 
 sc/source/core/data/documen8.cxx  |2 
 sc/source/core/data/dpobject.cxx  |4 -
 sc/source/core/data/poolhelp.cxx  |2 
 sc/source/core/data/table3.cxx|2 
 sc/source/filter/excel/xechart.cxx|8 +-
 sc/source/filter/excel/xestream.cxx   |9 +--
 sc/source/filter/excel/xestyle.cxx|4 -
 sc/source/filter/excel/xichart.cxx|   39 +++---
 sc/source/filter/inc/xlchart.hxx  |4 -
 sc/source/filter/oox/excelfilter.cxx  |   21 +++
 sc/source/filter/xml/xmlimprt.cxx |4 -
 sc/source/ui/docshell/docsh.cxx   |2 
 sc/source/ui/docshell/docsh2.cxx  |2 
 sc/source/ui/docshell/impex.cxx   |   12 ++--
 sc/source/ui/unoobj/forbiuno.cxx  |2 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx   |6 --
 sc/util/scfilt.component  |2 
 sd/source/filter/eppt/pptx-epptooxml.cxx  |5 +
 sd/util/sdfilt.component  |1 
 tools/source/debug/debug.cxx  |2 
 ucb/Library_ucpext.mk |1 
 xmlscript/Library_xmlscript.mk|1 
 44 files changed, 325 insertions(+), 130 deletions(-)

New commits:
commit 02021163dbbcc8904da0b2138c8b53684dcc8ab4
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 13:52:07 2013 +0200

fdo#46808, Convert oox::PowerPointExport service to new style

The service already existed, it just needed an IDL file

Change-Id: I1404f4f60abafd489ddfb7294affcc7ff33885ce

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 79f76c8..20aa8a7 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -262,6 +262,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/oox,\
ExcelFilterExport \
+   PowerPointExport \
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
ManifestReader \
diff --git a/offapi/com/sun/star/oox/PowerPointExport.idl 
b/offapi/com/sun/star/oox/PowerPointExport.idl
new file mode 100644
index 000..14f84eb
--- /dev/null
+++ b/offapi/com/sun/star/oox/PowerPointExport.idl
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   

Re: minutes of ESC call ...

[Bjoern Michaelsen]

On Sat, May 18, 2013 at 09:46:18PM +0200, Eike Rathke wrote:
 Hi,
 
 On Thursday, 2013-05-16 17:55:11 +0200, Bjoern Michaelsen wrote:
 
   * Hamburg hack-fest (Thorsten)
  AI: + connect to University of Hamburg (Eike, verbally commited to that 
  in a careless moment)
 
 Lol, contact initialized, Bjoern (was on Cc) will have to take over.

Thats clearly cheating!

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

[Jürgen Schmidt]

 solenv/inc/minor.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8244f9cbe48e171c0ad0cfbd41efadecac41696d
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 11:10:28 2013 +

increase build id and minor, future imporvement is to get rid of this and 
use rev only

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 9e43088..7e9a080 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
 #
 # *
 RSCVERSION=400
-RSCREVISION=400m1(Build:9700)
-BUILD=9700
-LAST_MINOR=m1
+RSCREVISION=400m2(Build:9701)
+BUILD=9701
+LAST_MINOR=m2
 SOURCEVERSION=AOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

checking external lib versions (was: libreoffice + liborcus build problem)

[Bjoern Michaelsen]

Hi,

On Sat, May 18, 2013 at 05:40:38PM -0400, Kohei Yoshida wrote:
 
 Trying to build libreoffice 4.0.3.3 with liborcus 0.5.1 and that
 unfortunately
 fails with:
 You can't build the 4.0 branch with 0.5.1. You need to use 0.3.0.

As package maintainer, I have been repeatedly nagged about the versioning of
the essentially TDF-hosted but officially external libs (not only orcus, but
also wp*, cmis and friends). Proper versioning would go with full so-name
versioning for ABI-changes etc. AFAIK Rene is retrofitting this somewhat on the
Debian packages, but it would be better if this would happen directly upstream.
If we dont want to do that work, wouldnt it make sense though to at least
detect the version in the configure-script to safe newcomers frustrations?
Might be an EasyHack, if the supported versions of these external libs are
clearly defined.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: checking external lib versions

[Kohei Yoshida]

On 05/21/2013 08:10 AM, Bjoern Michaelsen wrote:

Hi,

On Sat, May 18, 2013 at 05:40:38PM -0400, Kohei Yoshida wrote:

Trying to build libreoffice 4.0.3.3 with liborcus 0.5.1 and that
unfortunately
fails with:

You can't build the 4.0 branch with 0.5.1. You need to use 0.3.0.

As package maintainer, I have been repeatedly nagged about the versioning of
the essentially TDF-hosted but officially external libs (not only orcus, but
also wp*, cmis and friends). Proper versioning would go with full so-name
versioning for ABI-changes etc.
FWIW, liborcus clearly defines API version.  The one for 4.0 is 
liborcus-4.0, and the one for the master is liborcus-6.0. Is there 
anything else you are suggesting we do?



  AFAIK Rene is retrofitting this somewhat on the
Debian packages, but it would be better if this would happen directly upstream.
If we dont want to do that work, wouldnt it make sense though to at least
detect the version in the configure-script to safe newcomers frustrations?

Sure. That would be a great idea.  I have no objection.

Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download external/msvcp100 external/prj oowintool scp2/source

[Andras Timar]

 download |   14 -
 external/msvcp100/README_msvcX100.dll|2 
 external/prj/d.lst   |4 +
 oowintool|2 
 scp2/source/ooo/vc_redist.scp|   22 -
 scp2/source/winexplorerext/file_winexplorerext.scp   |   45 +++
 scp2/source/winexplorerext/module_winexplorerext.scp |6 ++
 7 files changed, 58 insertions(+), 37 deletions(-)

New commits:
commit d7b428453b07f48b56e7d83f05d81fae91b921c8
Author: Andras Timar ati...@suse.com
Date:   Tue May 21 03:43:52 2013 -0700

make 64-bit shell extensions work, put 64-bit VC runtime in the same dir

Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is 
installed
to the system32 folder. Windows installer automatically replaces it to
SysWOW64. The problem is that this way 64-bit dlls end up in the wrong 
directory.
They conflict with the 32-bit dlls, and will not be installed. Therefore
64-bit shell extensions will not work, unless the 64-bit VC runtime is
installed from other source. It is not possible to install both 32-bit and
64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012.
For the 64-bit shell extensions, we can install the runtime dlls next to 
the files.

Conflicts:

scp2/source/ooo/vc_redist.scp

Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60
Reviewed-on: https://gerrit.libreoffice.org/3990
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download b/download
index 985443c..a04d1f4 100755
--- a/download
+++ b/download
@@ -50,14 +50,9 @@ if [ $COM = MSC -a $CPUNAME = INTEL ]; then
 fi
 
 if [ $COM = MSC ]; then
-if [ $CPUNAME = INTEL ]; then
-ver=
-else
-ver=-64
-fi
 # use oowintool to copy CRT dlls and manifest
-if ! ./oowintool --msvc-copy-dlls$ver ./external/msvcp ; then
-   echo oowintool failed to copy CRT
+if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
+   echo oowintool failed to copy 64-bit CRT
exit 1
 fi
 
@@ -66,11 +61,6 @@ if [ $COM = MSC ]; then
echo oowintool failed to copy merge modules
exit 1
 fi
-if [ $CPUNAME = INTEL ]; then
-if ! ./oowintool --msvc-copy-msms-64 ./external/msm$VCVER ; then
-   echo WARNING: oowintool failed to copy x64 merge modules, 
installation will lack the 64-bit Explorer extension
-fi
-fi
 fi
 
 # Local Variables:
diff --git a/external/msvcp100/README_msvcX100.dll 
b/external/msvcp100/README_msvcX100.dll
index a1b0e73..ada64ed 100644
--- a/external/msvcp100/README_msvcX100.dll
+++ b/external/msvcp100/README_msvcX100.dll
@@ -1,2 +1,2 @@
-Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a
+Put 64-bit msvcp100.dll, msvcr100.dll in this directory for Windows builds 
using a
 VS 2010 / VC 10.0 compiler.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 7ee2582..c357edc 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,6 +36,10 @@ mkdir: %_DEST%\inc\external\wine
 ..\msvcp90\msvcr90*.dll %_DEST%\bin
 ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
 ..\msvcp90\Microsoft.VC90.DebugCRT.manifest 
%_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
+..\msvcp100\msvcp100*.dll %_DEST%\bin
+..\msvcp100\msvcr100*.dll %_DEST%\bin
+..\msvcp110\msvcp110*.dll %_DEST%\bin
+..\msvcp110\msvcr110*.dll %_DEST%\bin
 ..\msm90\*.msm %_DEST%\bin
 ..\msm100\*.msm %_DEST%\bin
 ..\msm110\*.msm %_DEST%\bin
diff --git a/oowintool b/oowintool
index 26221f0..6f5ab7c 100755
--- a/oowintool
+++ b/oowintool
@@ -313,7 +313,7 @@ sub msvc_copy_dlls($$)
 my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
   $ver-{'dll_path'});
 
-$srcdir =~ s/x86/amd64/ if ($arch eq 'amd64');
+$srcdir =~ s|/x86/|/x64/| if ($arch eq 'amd64');
 
 copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll,
   $dest . $ver-{'dll_suffix'});
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index fa7d1c2..82cd0d0 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -87,26 +87,4 @@ End
 
 #endif
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC100_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = VC_REDIST=1;
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
-Feature = gm_Root;
-Name = Microsoft_VC110_CRT_x64.msm;
-RootDir = TARGETDIR;
-ComponentCondition = VC_REDIST=1;
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp 
b/scp2/source/winexplorerext/file_winexplorerext.scp
index f2a2a89..1aadacf 100644
--- 

[PUSHED libreoffice-4-0] make 64-bit shell extensions work, put 64-bit VC runtime in ...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3990

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3990
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - connectivity/Library_kab1.mk filter/source framework/inc framework/source

[Noel Grandin]

 connectivity/Library_kab1.mk|1 
 filter/source/pdf/impdialog.cxx |4 
 filter/source/pdf/impdialog.hxx |6 -
 filter/source/pdf/pdfdialog.cxx |2 
 framework/inc/uielement/menubarmanager.hxx  |   10 +-
 framework/source/layoutmanager/layoutmanager.cxx|2 
 framework/source/uielement/generictoolbarcontroller.cxx |2 
 framework/source/uielement/menubarmanager.cxx   |   67 +++-
 framework/source/uielement/menubarwrapper.cxx   |2 
 9 files changed, 43 insertions(+), 53 deletions(-)

New commits:
commit 884217479de20e2ff5217a0829d678f416fb8505
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 14:45:48 2013 +0200

fdo#46808, Convert more XMultiServiceFactory to XComponentContext

Change-Id: Ia9fe1a95aab5f466ce212e442eba791f265488b5

diff --git a/framework/inc/uielement/menubarmanager.hxx 
b/framework/inc/uielement/menubarmanager.hxx
index 6198f71..37d6893 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -81,7 +81,7 @@ class MenuBarManager : public 
com::sun::star::frame::XStatusListener
 {
 protected:
 MenuBarManager(
-const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  xServiceFactory,
+const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  xContext,
 const ::com::sun::star::uno::Reference 
com::sun::star::frame::XFrame  rFrame,
 const ::com::sun::star::uno::Reference 
::com::sun::star::util::XURLTransformer  _xURLTransformer,
 AddonMenu*  pAddonMenu,
@@ -89,7 +89,7 @@ class MenuBarManager : public 
com::sun::star::frame::XStatusListener
 sal_BoolbDeleteChildren );
 
 MenuBarManager(
-const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  xServiceFactory,
+const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  xContext,
 const ::com::sun::star::uno::Reference 
com::sun::star::frame::XFrame  rFrame,
 const ::com::sun::star::uno::Reference 
::com::sun::star::util::XURLTransformer  _xURLTransformer,
 AddonPopupMenu* pAddonMenu,
@@ -98,7 +98,7 @@ class MenuBarManager : public 
com::sun::star::frame::XStatusListener
 
 public:
 MenuBarManager(
-const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  xServiceFactory,
+const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  xContext,
 const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XFrame  rFrame,
 const ::com::sun::star::uno::Reference 
::com::sun::star::util::XURLTransformer  _xURLTransformer,
 const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XDispatchProvider  rDispatchProvider,
@@ -107,7 +107,7 @@ class MenuBarManager : public 
com::sun::star::frame::XStatusListener
 sal_Bool bDelete,
 sal_Bool bDeleteChildren );
 
-const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  getServiceFactory();
+const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext  getComponentContext();
 
 virtual ~MenuBarManager();
 
@@ -245,7 +245,7 @@ class MenuBarManager : public 
com::sun::star::frame::XStatusListener
 ::com::sun::star::uno::Reference 
::com::sun::star::ui::XAcceleratorConfiguration m_xDocAcceleratorManager;
 ::com::sun::star::uno::Reference 
::com::sun::star::ui::XAcceleratorConfiguration 
m_xModuleAcceleratorManager;
 ::com::sun::star::uno::Reference 
::com::sun::star::ui::XAcceleratorConfiguration 
m_xGlobalAcceleratorManager;
-::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactorymxServiceFactory;
+::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContextm_xContext;
 ::com::sun::star::uno::Reference 
::com::sun::star::util::XURLTransformer m_xURLTransformer;
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XIndexAccess   m_xDeferedItemContainer;
 sal_Int16  
m_nSymbolsStyle;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index 2784927..173a0fe 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1169,7 +1169,7 @@ throw (uno::RuntimeException)
 Reference XDispatchProvider  xDispatchProvider;
 
 MenuBar* pMenuBar = new MenuBar;
-m_pInplaceMenuBar = new 

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - instsetoo_native/CustomTarget_install.mk

[Tor Lillqvist]

 instsetoo_native/CustomTarget_install.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 863c4bbca548348b10620dd01fe1859d81aec102
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri May 17 13:42:42 2013 +0300

Check for ODK in BUILD_TYPE

Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 78ed0a1..4aa7cbd 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -105,12 +105,14 @@ ifeq (TRUE,$(LIBO_DEV_INSTALL))
unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
+ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(DEVINSTALLDIR)/opt/
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
+endif
 else # LIBO_DEV_INSTALL
$(call 
instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/Package_autodoc.mk

[Stephan Bergmann]

 odk/Package_autodoc.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6aa19bf090ac03fcb55479155abb0d59f43d766a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 14:57:05 2013 +0200

Adapt to new com/sun/star/oox/

...introduced by a986eddb9b9d1de71ae1c6f73246e493cc449c21 fdo#46808, 
Convert
oox.ExcelFilterExport service to new style.

Change-Id: Ie44688f02ffb73ff5967b66e649827058236614e

diff --git a/odk/Package_autodoc.mk b/odk/Package_autodoc.mk
index bd1117b..b73e7ba 100644
--- a/odk/Package_autodoc.mk
+++ b/odk/Package_autodoc.mk
@@ -107,6 +107,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME)
com/sun/star/media \
com/sun/star/mozilla \
com/sun/star/office \
+   com/sun/star/oox \
com/sun/star/packages \
com/sun/star/packages/manifest \
com/sun/star/packages/zip \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 9a/421d5c9c0fd4f04c08c10e24275255fdf34f83 d8/933b9c61e3e15f788f43043975f48d9d5b6cfd

[Caolán McNamara]

 9a/421d5c9c0fd4f04c08c10e24275255fdf34f83 |1 +
 d8/933b9c61e3e15f788f43043975f48d9d5b6cfd |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e772169f1bff088a2b90af2b8342d6e43bcd171c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:03:48 2013 +0100

Notes added by 'git notes add'

diff --git a/9a/421d5c9c0fd4f04c08c10e24275255fdf34f83 
b/9a/421d5c9c0fd4f04c08c10e24275255fdf34f83
new file mode 100644
index 000..af9b33f
--- /dev/null
+++ b/9a/421d5c9c0fd4f04c08c10e24275255fdf34f83
@@ -0,0 +1 @@
+merged as: 3f0dbd2cbe17f276ac3b2445ac76ff0cafc260c6
commit 32d41da25cef71e019effc906da5b7a77c5e61fa
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:03:35 2013 +0100

Notes added by 'git notes add'

diff --git a/d8/933b9c61e3e15f788f43043975f48d9d5b6cfd 
b/d8/933b9c61e3e15f788f43043975f48d9d5b6cfd
new file mode 100644
index 000..9ce8e7b
--- /dev/null
+++ b/d8/933b9c61e3e15f788f43043975f48d9d5b6cfd
@@ -0,0 +1 @@
+merged as: f59d23fedc89890f47eac3b05f54bdcb7325f7af
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 06/b91eb4cc81dde86875445c5acaa5c57111333b 3f/1dd0f6b392c104e0a7c7c2623d5d688f8622c0

[Caolán McNamara]

 06/b91eb4cc81dde86875445c5acaa5c57111333b |1 +
 3f/1dd0f6b392c104e0a7c7c2623d5d688f8622c0 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f3082fb6110f624a83972f8761cbdd76216ce231
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:04:13 2013 +0100

Notes added by 'git notes add'

diff --git a/3f/1dd0f6b392c104e0a7c7c2623d5d688f8622c0 
b/3f/1dd0f6b392c104e0a7c7c2623d5d688f8622c0
new file mode 100644
index 000..67504f3
--- /dev/null
+++ b/3f/1dd0f6b392c104e0a7c7c2623d5d688f8622c0
@@ -0,0 +1 @@
+merged as: 819840979b82a7b19329eda63db0d5f8a291b9de
commit 748678f97b7ef3df957aa5d0631a66aaeab998ab
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:04:00 2013 +0100

Notes added by 'git notes add'

diff --git a/06/b91eb4cc81dde86875445c5acaa5c57111333b 
b/06/b91eb4cc81dde86875445c5acaa5c57111333b
new file mode 100644
index 000..d21fa35
--- /dev/null
+++ b/06/b91eb4cc81dde86875445c5acaa5c57111333b
@@ -0,0 +1 @@
+merged as: 4fcda14828d2fa65cc2541ed3e3cb93dd7bc9ac8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 0b/3a77478cf2cfd245a87bc528f851e959a2e6c7 6c/640ee420df6f7c9f3ab981e49ee304f1d2319e

[Caolán McNamara]

 0b/3a77478cf2cfd245a87bc528f851e959a2e6c7 |1 +
 6c/640ee420df6f7c9f3ab981e49ee304f1d2319e |1 +
 2 files changed, 2 insertions(+)

New commits:
commit db886ec5f69a922bb03836d019c5f9f561c14e3b
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:04:38 2013 +0100

Notes added by 'git notes add'

diff --git a/0b/3a77478cf2cfd245a87bc528f851e959a2e6c7 
b/0b/3a77478cf2cfd245a87bc528f851e959a2e6c7
new file mode 100644
index 000..01955b9
--- /dev/null
+++ b/0b/3a77478cf2cfd245a87bc528f851e959a2e6c7
@@ -0,0 +1 @@
+merged as: cfaac477e2a23880310070690beb3222b1c8227c
commit 2bb040f3185426a1af592e9fd4ca9a8170439fcc
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:04:25 2013 +0100

Notes added by 'git notes add'

diff --git a/6c/640ee420df6f7c9f3ab981e49ee304f1d2319e 
b/6c/640ee420df6f7c9f3ab981e49ee304f1d2319e
new file mode 100644
index 000..969074e
--- /dev/null
+++ b/6c/640ee420df6f7c9f3ab981e49ee304f1d2319e
@@ -0,0 +1 @@
+merged as: 25ec90bfa85ab829e47f442742c63dd41960b973
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: checking external lib versions

[Kohei Yoshida]

On 05/21/2013 08:16 AM, Kohei Yoshida wrote:
FWIW, liborcus clearly defines API version.  The one for 4.0 is 
liborcus-4.0, and the one for the master is liborcus-6.0.

I meant orcus-0.4 and orcus-0.6, respectively.

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3c/a8e86d4489f023160d69ba621a819a89ab90d5 f5/56d8d542b069778e9b9d2bf25575e740602a6f

[Caolán McNamara]

 3c/a8e86d4489f023160d69ba621a819a89ab90d5 |1 +
 f5/56d8d542b069778e9b9d2bf25575e740602a6f |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 8635cd1065aebf55ec08a6a85bc9ca37442b7530
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:05:28 2013 +0100

Notes added by 'git notes add'

diff --git a/3c/a8e86d4489f023160d69ba621a819a89ab90d5 
b/3c/a8e86d4489f023160d69ba621a819a89ab90d5
new file mode 100644
index 000..b608c36
--- /dev/null
+++ b/3c/a8e86d4489f023160d69ba621a819a89ab90d5
@@ -0,0 +1 @@
+merged as: f858fa266d8b33ccc27bb6a91f1923b9ea9cdaaa
commit 27a0266318db1ead08ddc2dc17ce0b4a7ac72ee4
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:05:16 2013 +0100

Notes added by 'git notes add'

diff --git a/f5/56d8d542b069778e9b9d2bf25575e740602a6f 
b/f5/56d8d542b069778e9b9d2bf25575e740602a6f
new file mode 100644
index 000..28490b3
--- /dev/null
+++ b/f5/56d8d542b069778e9b9d2bf25575e740602a6f
@@ -0,0 +1 @@
+merged as: 418118e8be4d71f6359333961f9e4cbe9c12a246
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 05/9f35d0ce96ccf14d02c6f33e25192d0c926b3f b2/db8c4c68553100b64af8f51bce2d496b12e882

[Caolán McNamara]

 05/9f35d0ce96ccf14d02c6f33e25192d0c926b3f |1 +
 b2/db8c4c68553100b64af8f51bce2d496b12e882 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 1bd38384bfe297c0e077e4ae8bb9ba7be4b94c18
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:05:02 2013 +0100

Notes added by 'git notes add'

diff --git a/05/9f35d0ce96ccf14d02c6f33e25192d0c926b3f 
b/05/9f35d0ce96ccf14d02c6f33e25192d0c926b3f
new file mode 100644
index 000..d0c7d5b
--- /dev/null
+++ b/05/9f35d0ce96ccf14d02c6f33e25192d0c926b3f
@@ -0,0 +1 @@
+merged as: 0d3b4f59fc43bc7aa9994195d55712aff87b3036
commit f0888966f8df2bde1f364ce762bc8fb1f4994eac
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:04:50 2013 +0100

Notes added by 'git notes add'

diff --git a/b2/db8c4c68553100b64af8f51bce2d496b12e882 
b/b2/db8c4c68553100b64af8f51bce2d496b12e882
new file mode 100644
index 000..d0827e6
--- /dev/null
+++ b/b2/db8c4c68553100b64af8f51bce2d496b12e882
@@ -0,0 +1 @@
+merged as: 1768904fd908e940a210e101c99a58ca1f7e3f27
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5c/795df0452046ad2aa8d0ec05092133e3e4ebc3

[Caolán McNamara]

 5c/795df0452046ad2aa8d0ec05092133e3e4ebc3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 62afc40ede5d9736132af14d8ebfca5c9a07d201
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:05:40 2013 +0100

Notes added by 'git notes add'

diff --git a/5c/795df0452046ad2aa8d0ec05092133e3e4ebc3 
b/5c/795df0452046ad2aa8d0ec05092133e3e4ebc3
new file mode 100644
index 000..b875404
--- /dev/null
+++ b/5c/795df0452046ad2aa8d0ec05092133e3e4ebc3
@@ -0,0 +1 @@
+merged as: 5dd32f76a9c0f924e6a514e309e7661ad5537e86
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 38/7af7c700c6584d6b663eed11e74882f7e874a0

[Caolán McNamara]

 38/7af7c700c6584d6b663eed11e74882f7e874a0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 82b8c071aecf5e7c3aa8af0abad83566e4549e0c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:06:18 2013 +0100

Notes added by 'git notes add'

diff --git a/38/7af7c700c6584d6b663eed11e74882f7e874a0 
b/38/7af7c700c6584d6b663eed11e74882f7e874a0
new file mode 100644
index 000..454bfdf
--- /dev/null
+++ b/38/7af7c700c6584d6b663eed11e74882f7e874a0
@@ -0,0 +1 @@
+prefer: 7de47fe4ce076695a654198cf2c81ce3021d2cfb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal

[Tor Lillqvist]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2304089b4b7205fbcbc66762368e9781051ef27b
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:07:23 2013 +0300

Also plain tools is used as a sal logging area

Change-Id: I98a578f3934fda9ed49c31d1a1d171d4b6f6ed91

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index bee62d6..e23c414 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -222,6 +222,7 @@ certain functionality.
 
 @section tools
 
+@li @c tools
 @li @c tools.debug
 @li @c tools.datetime
 @li @c tools.generic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/n818997.rtf   |   77 ++
 sw/qa/extras/rtfimport/rtfimport.cxx  |8 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |   13 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   15 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|4 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|2 
 7 files changed, 120 insertions(+)

New commits:
commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue May 21 14:56:45 2013 +0200

bnc#818997 RTF import: don't ignore page breaks between shapes

Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a

diff --git a/sw/qa/extras/rtfimport/data/n818997.rtf 
b/sw/qa/extras/rtfimport/data/n818997.rtf
new file mode 100644
index 000..2ce4404
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n818997.rtf
@@ -0,0 +1,77 @@
+{\rtf 
+{\shp 
+{\*\shpinst\shpleft2310\shpright6060\shptop8685\shpbottom8985\shpbxpage
+\shpbypage\shpwr3\shpz2 
+{\sp 
+{\sn shapeType}
+{\sv 202}
+}
+{\sp 
+{\sn dxTextLeft}
+{\sv 
+0}
+}
+{\sp 
+{\sn dxTextRight}
+{\sv 0}
+}
+{\sp 
+{\sn dyTextTop}
+{\sv 0}
+}
+{\sp 
+{\sn 
+dyTextBottom}
+{\sv 0}
+}
+{\sp 
+{\sn fLine}
+{\sv 0}
+}
+{\shptxt\plain\pard\f29\fs24 
+On first page.\par}
+{\sp 
+{\sn fFilled}
+{\sv 0}
+}
+}
+}
+\page
+{\shp 
+{\*\shpinst\shpleft4800\shpright8025\shptop780\shpbottom1080\shpbxpage
+\shpbypage\shpwr3\shpz2 
+{\sp 
+{\sn shapeType}
+{\sv 202}
+}
+{\sp 
+{\sn dxTextLeft}
+{\sv 
+0}
+}
+{\sp 
+{\sn dxTextRight}
+{\sv 0}
+}
+{\sp 
+{\sn dyTextTop}
+{\sv 0}
+}
+{\sp 
+{\sn 
+dyTextBottom}
+{\sv 0}
+}
+{\sp 
+{\sn fLine}
+{\sv 0}
+}
+{\shptxt\plain\pard\f29\fs24\b 
+On second page.\par}
+{\sp 
+{\sn fFilled}
+{\sv 0}
+}
+}
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index d2ccfba..c0ceabc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -135,6 +135,7 @@ public:
 void testFdo63023();
 void testFdo42109();
 void testFdo62977();
+void testN818997();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -259,6 +260,7 @@ void Test::run()
 {fdo63023.rtf, Test::testFdo63023},
 {fdo42109.rtf, Test::testFdo42109},
 {fdo62977.rtf, Test::testFdo62977},
+{n818997.rtf, Test::testN818997},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1232,6 +1234,12 @@ void Test::testFdo62977()
 getRun(getParagraph(1), 1, 
OUString(\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88, 9, RTL_TEXTENCODING_UTF8));
 }
 
+void Test::testN818997()
+{
+// \page was ignored between two \shp tokens.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9de2fa6..10a018a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3486,6 +3486,19 @@ void DomainMapper::lcl_startShape( uno::Reference 
drawing::XShape  xShape )
 {
 if (m_pImpl-GetTopContext())
 {
+// If there is a deferred page break, handle it now, so that the
+// started shape will be on the correct page.
+if (m_pImpl-isBreakDeferred(PAGE_BREAK))
+{
+m_pImpl-clearDeferredBreak(PAGE_BREAK);
+lcl_startCharacterGroup();
+sal_uInt8 sBreak[] = { 0xd };
+lcl_text(sBreak, 1);
+lcl_endCharacterGroup();
+lcl_endParagraphGroup();
+lcl_startParagraphGroup();
+m_pImpl-GetTopContext()-Insert(PROP_BREAK_TYPE, true, 
uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE));
+}
 m_pImpl-PushShapeContext( xShape );
 lcl_startParagraphGroup();
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c05750c..fa6b36d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -644,6 +644,21 @@ bool DomainMapper_Impl::isBreakDeferred( BreakType 
deferredBreakType )
 }
 }
 
+void DomainMapper_Impl::clearDeferredBreak(BreakType deferredBreakType)
+{
+switch (deferredBreakType)
+{
+case COLUMN_BREAK:
+m_bIsColumnBreakDeferred = false;
+break;
+case PAGE_BREAK:
+m_bIsPageBreakDeferred = false;
+break;
+default:
+break;
+}
+}
+
 void DomainMapper_Impl::clearDeferredBreaks()
 {
 m_bIsColumnBreakDeferred = false;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 60faa83..b7da3a9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ 

[Libreoffice-commits] core.git: include/sal

[Tor Lillqvist]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a43c99589fcd01aaacb50a7aabca8c46a8479519
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:18:55 2013 +0300

Add canvas.vcl

Change-Id: I761217ac3791b631c58ccead73b7c45818db0589

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e23c414..90eeecd 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -43,6 +43,7 @@ certain functionality.
 @li @c canvas
 @li @c canvas.cairo
 @li @c canvas.null
+@li @c canvas.vcl
 
 @section chart2
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/Library_macab1.mk

[Tor Lillqvist]

 connectivity/Library_macab1.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0dfa58bdd9bd2ee12fe00674e7a9a1b55939a84b
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:24:42 2013 +0300

Add tl for DbgUnhandledException()

Change-Id: I612f0e473280342f4e406ebee7002a40622fbbf0

diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 8c33fda..263d0b1 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,macab1,\
dbtools \
sal \
salhelper \
+   tl \
 ))
 
 $(eval $(call gb_Library_set_include,macab1,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/inc

[Tor Lillqvist]

 framework/inc/uielement/genericstatusbarcontroller.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff72e05c9f99ab694685536a2d05558021b14b14
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:28:58 2013 +0300

WaE: 'AddonStatusbarItemData' struct/class confusion

Change-Id: I20b0b17dffe98ec27b686e0adfe8aaf6e10068ab

diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx 
b/framework/inc/uielement/genericstatusbarcontroller.hxx
index 3f73df8..bc4a71d 100644
--- a/framework/inc/uielement/genericstatusbarcontroller.hxx
+++ b/framework/inc/uielement/genericstatusbarcontroller.hxx
@@ -25,7 +25,7 @@
 namespace framework
 {
 
-class AddonStatusbarItemData;
+struct AddonStatusbarItemData;
 
 class GenericStatusbarController : public svt::StatusbarController
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 82/44f9cbe48e171c0ad0cfbd41efadecac41696d

[Caolán McNamara]

 82/44f9cbe48e171c0ad0cfbd41efadecac41696d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d57affd16af60ac1045a60cc00da6152eb4ce122
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:33:20 2013 +0100

Notes added by 'git notes add'

diff --git a/82/44f9cbe48e171c0ad0cfbd41efadecac41696d 
b/82/44f9cbe48e171c0ad0cfbd41efadecac41696d
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/82/44f9cbe48e171c0ad0cfbd41efadecac41696d
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4e/66f9d91f3067703d5b41370d77d666ced1917e

[Caolán McNamara]

 4e/66f9d91f3067703d5b41370d77d666ced1917e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d712b42124feccfa41e082e069ca87d50b173753
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:33:41 2013 +0100

Notes added by 'git notes add'

diff --git a/4e/66f9d91f3067703d5b41370d77d666ced1917e 
b/4e/66f9d91f3067703d5b41370d77d666ced1917e
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/4e/66f9d91f3067703d5b41370d77d666ced1917e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/start-irker.sh

[Miklos Vajna]

 ciabot/start-irker.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f8cbfaffbb1e7c076c8843884147dd70401f2bd
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue May 21 15:33:40 2013 +0200

ciabot: update to latest irker, can handle custom nick without patching

Change-Id: I5fc5df3e150cf0d06cf1e8bfc71785de5b6121a5

diff --git a/ciabot/start-irker.sh b/ciabot/start-irker.sh
index ee09b53..3d7b40e 100755
--- a/ciabot/start-irker.sh
+++ b/ciabot/start-irker.sh
@@ -3,5 +3,5 @@
 cd ~/bin/irker
 export PYTHONPATH=irc-8.0.1
 if test -z `ps ax | grep irkerd | grep -v grep`; then
-   ./irkerd irkerd.log 
+   ./irkerd -n loirkerbot irkerd.log 
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 62/fa229f6bd4d93a572c1a5a3d4cc5022cb270fa

[Caolán McNamara]

 62/fa229f6bd4d93a572c1a5a3d4cc5022cb270fa |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ca5bf81a23f9bfc51ba8016edfa19c106fea762f
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:34:21 2013 +0100

Notes added by 'git notes add'

diff --git a/62/fa229f6bd4d93a572c1a5a3d4cc5022cb270fa 
b/62/fa229f6bd4d93a572c1a5a3d4cc5022cb270fa
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/62/fa229f6bd4d93a572c1a5a3d4cc5022cb270fa
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 11/f657e989d677f53609af82f9002f50f064953e

[Caolán McNamara]

 11/f657e989d677f53609af82f9002f50f064953e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 50b8ad0855301d543c5196b8aed19dd13fa9f219
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 21 14:35:04 2013 +0100

Notes added by 'git notes add'

diff --git a/11/f657e989d677f53609af82f9002f50f064953e 
b/11/f657e989d677f53609af82f9002f50f064953e
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/11/f657e989d677f53609af82f9002f50f064953e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svx/source

[Tor Lillqvist]

 svx/source/sidebar/nbdtmg.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 2b4b867304a666b8d412fd6ff0f88519a3db753b
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:49:04 2013 +0300

WaE: unused variables

Change-Id: Ib46ec040c4adc5bdab3c5219157ae60582604c63

diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index e88c9f5..0976150 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -302,7 +302,7 @@ BulletsTypeMgr::BulletsTypeMgr(const BulletsTypeMgr 
aTypeMgr):
 void BulletsTypeMgr::Init()
 {
 Font rActBulletFont = lcl_GetDefaultBulletFont();
-String sName = rActBulletFont.GetName();
+
 if( Application::GetSettings().GetLayoutRTL() )
 {
 for (sal_uInt16 i=0;iDEFAULT_BULLET_TYPES;i++)
@@ -679,7 +679,6 @@ sal_Bool 
GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule aNum,sal_uInt16 nIn
 else
 return sal_False;
 
-String sEmpty;
 if ( pGrf )
 {
 const String* pGrfName = pBrsh-GetGraphicLink();
@@ -988,14 +987,12 @@ sal_uInt16 
MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16
 if( eNumType == SVX_NUM_CHAR_SPECIAL)
 {
 sal_Unicode cChar = aFmt.GetBulletChar();
-const Font* pFont = aFmt.GetBulletFont();
-String sName = pFont?pFont-GetName():String();
+// const Font* pFont = aFmt.GetBulletFont();
 
 for(sal_uInt16 i = nFromIndex; i  DEFAULT_BULLET_TYPES; i++)
 {
 if ( pActualBullets[i]-eType == eNBType::BULLETS )
 {
-String ssName = 
((BulletsSettings_Impl*)(pActualBullets[i]-pBullets))-aFont.GetName();
 if ( (cChar == 
((BulletsSettings_Impl*)(pActualBullets[i]-pBullets))-cBulletChar||
 (cChar == 9830  57356 == 
((BulletsSettings_Impl*)(pActualBullets[i]-pBullets))-cBulletChar) ||
 (cChar == 9632  57354 == 
((BulletsSettings_Impl*)(pActualBullets[i]-pBullets))-cBulletChar)))//
@@ -1161,7 +1158,6 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule 
aNum,sal_uInt16 nIndex,s
 else
 return sal_False;
 
-String sEmpty;
 const String* pGrfName = 0;
 if ( pGrf )
 {
@@ -1498,7 +1494,6 @@ sal_uInt16 
NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 m
 //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
 String sPreFix = aFmt.GetPrefix();
 String sLclSuffix = aFmt.GetSuffix();
-String sEmpty;
 sal_Int16 eNumType = aFmt.GetNumberingType();
 
 sal_uInt16 nCount = pNumberSettingsArr-size();
@@ -1757,14 +1752,13 @@ sal_uInt16 
OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16 /*m
 SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
 String sPreFix = aFmt.GetPrefix();
 String sLclSuffix = aFmt.GetSuffix();
-String sEmpty;
 sal_Int16 eNumType = aFmt.GetNumberingType();
 if( eNumType == SVX_NUM_CHAR_SPECIAL)
 {
 sal_Unicode cChar = aFmt.GetBulletChar();
 //const Font* pFont = aFmt.GetBulletFont();
 sal_Unicode ccChar = _pSet-sBulletChar.getStr()[0];
-rtl::OUString sFont = _pSet-sBulletFont;
+// rtl::OUString sFont = _pSet-sBulletFont;
 if ( !((cChar == ccChar)  //pFont  
sFont.compareTo(pFont-GetName()) 
 _pSet-eLabelFollowedBy == aFmt.GetLabelFollowedBy() 
 _pSet-nTabValue == aFmt.GetListtabPos() 
commit 61493e499f44821405c10c4347038bde16a9072c
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:46:10 2013 +0300

Fix warning: statement aligned as second statement in if body ... [loplugin]

Change-Id: Ic3ef17414cbae5fea5a62d61d33e64727603d058

diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 2acc98d..e88c9f5 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1953,7 +1953,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule 
aNum,sal_uInt16 nIndex,sal_uIn
  aFmt.SetBulletFont( aCreateFont );
 }
 }else
-aFmt.SetBulletFont( rActBulletFont );
+aFmt.SetBulletFont( rActBulletFont );
 
 sal_Unicode cChar = 0;
 if( pLevelSettings-sBulletChar.getLength() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#64826: fix for exporting to DOCX that didnt save track '...

[Adam CloudOn (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3991

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3991/1

fdo#64826: fix for exporting to DOCX that didnt save track 'changes state'

Change-Id: If5b3198769a08cc751d542f8305fd7f41c73ec26
---
M sw/source/filter/ww8/docxexport.cxx
M sw/source/filter/ww8/docxexport.hxx
2 files changed, 23 insertions(+), 0 deletions(-)



diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index e04f12d..18d0583 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -686,18 +686,33 @@
 // Zoom
 OString 
aZoom(OString::valueOf(sal_Int32(pViewShell-GetViewOptions()-GetZoom(;
 pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
+
+// Track Changes
+if ( settings.trackRevisions )
+pFS-singleElementNS( XML_w, XML_trackRevisions, FSEND );
+
+// Embed Fonts
 if( pDoc-get( IDocumentSettingAccess::EMBED_FONTS ))
 pFS-singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND );
+
+// Embed System Fonts
 if( pDoc-get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ))
 pFS-singleElementNS( XML_w, XML_embedSystemFonts, FSEND );
+
+// Default Tab Stop
 if( settings.defaultTabStop != 0 )
 pFS-singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val 
),
 OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), 
FSEND );
+
+// Even and Odd Headers
 if( settings.evenAndOddHeaders )
 pFS-singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND );
 
+// Has Footnotes
 if( m_pAttrOutput-HasFootnotes())
 m_pAttrOutput-WriteFootnoteEndnotePr( pFS, XML_footnotePr, 
pDoc-GetFtnInfo(), XML_footnote );
+
+// Has Endnotes
 if( m_pAttrOutput-HasEndnotes())
 m_pAttrOutput-WriteFootnoteEndnotePr( pFS, XML_endnotePr, 
pDoc-GetEndNoteInfo(), XML_endnote );
 
@@ -809,6 +824,9 @@
   m_nFooters( 0 ),
   m_pVMLExport( NULL )
 {
+// Set the 'Track Revisions' flag in the settings structure
+settings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON  
mnRedlineMode );
+
 // Write the document properies
 WriteProperties( );
 
@@ -840,6 +858,7 @@
 DocxSettingsData::DocxSettingsData()
 : evenAndOddHeaders( false )
 , defaultTabStop( 0 )
+, trackRevisions( false )
 {
 }
 
@@ -849,6 +868,9 @@
 return true;
 if( defaultTabStop != 0 )
 return true;
+if ( trackRevisions )
+return true;
+
 return false;
 }
 
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 16bf73e..2348349 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -54,6 +54,7 @@
 bool hasData() const; /// returns true if there are any non-default 
settings (i.e. something to write)
 bool evenAndOddHeaders;
 int defaultTabStop;
+bool trackRevisions;// Should 'Track Revisions' be set
 };
 
 /// The class that does all the actual DOCX export-related work.

-- 
To view, visit https://gerrit.libreoffice.org/3991
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5b3198769a08cc751d542f8305fd7f41c73ec26
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: translations

[Petr Mladek]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ab7e0dd4e1b238db28de6abe5434d91a5bf32ff
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 13:36:57 2013 +0200

Updated core
Project: translations  66306b922014c7941665d67e1310a88e3e85f99d

diff --git a/translations b/translations
index 6148d02..66306b9 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6148d0296697632af52c5e39787cd09c2a748fd7
+Subproject commit 66306b922014c7941665d67e1310a88e3e85f99d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sv source/te source/uz

[Petr Mladek]

 source/sv/scp2/source/accessories.po |2 +-
 source/te/scp2/source/impress.po |2 +-
 source/uz/scp2/source/writer.po  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 66306b922014c7941665d67e1310a88e3e85f99d
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 13:36:57 2013 +0200

fix typos when translating srings with %PRODUCTNAME macro

Change-Id: I7ee8893e956c4e1d858cf1cde1f29e1c70dab9d6

diff --git a/source/sv/scp2/source/accessories.po 
b/source/sv/scp2/source/accessories.po
index aa346d2..8bad9ee 100644
--- a/source/sv/scp2/source/accessories.po
+++ b/source/sv/scp2/source/accessories.po
@@ -1901,7 +1901,7 @@ msgctxt 
 STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT\n
 LngText.text
 msgid %PRODUCTNAME advertisement materials.
-msgstr Reklammaterial för %PRODUKTNAMN.
+msgstr Reklammaterial för %PRODUCTNAME.
 
 #: module_samples_accessories.ulf
 msgctxt 
diff --git a/source/te/scp2/source/impress.po b/source/te/scp2/source/impress.po
index 16091bc..bb33ace 100644
--- a/source/te/scp2/source/impress.po
+++ b/source/te/scp2/source/impress.po
@@ -77,7 +77,7 @@ msgctxt 
 STR_DESC_MODULE_PRG_IMPRESS_BIN\n
 LngText.text
 msgid The application %PRODUCTNAME Impress
-msgstr %%PRODUCTNAME ముద్ర 
కార్యక్షేత్రము
+msgstr %PRODUCTNAME ముద్ర 
కార్యక్షేత్రము
 
 #: module_impress.ulf
 msgctxt 
diff --git a/source/uz/scp2/source/writer.po b/source/uz/scp2/source/writer.po
index fbe1fe1..96fa33d 100644
--- a/source/uz/scp2/source/writer.po
+++ b/source/uz/scp2/source/writer.po
@@ -28,7 +28,7 @@ msgctxt 
 STR_DESC_MODULE_PRG_WRT\n
 LngText.text
 msgid Create and edit text and graphics in letters, reports, documents and 
Web pages by using %PRODUCTNAME Writer.
-msgstr %PRODUCTNAM Writer yordamida xatlar uchun matnlar, hisobotlar, 
hujjatlar yoki veb sahifalar yaratish.
+msgstr %PRODUCTNAME Writer yordamida xatlar uchun matnlar, hisobotlar, 
hujjatlar yoki veb sahifalar yaratish.
 
 #: module_writer.ulf
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 3 commits - connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_macab1.mk connectivity/Library_mork.mk connectivit

[Tor Lillqvist]

 connectivity/Library_jdbc.mk   |1 +
 connectivity/Library_kab1.mk   |1 +
 connectivity/Library_macab1.mk |1 +
 connectivity/Library_mork.mk   |1 +
 connectivity/Library_sdbc2.mk  |1 +
 extensions/Library_log.mk  |1 +
 include/tools/diagnose_ex.h|3 ++-
 tools/source/debug/debug.cxx   |2 +-
 ucb/Library_ucpext.mk  |1 +
 xmlscript/Library_xmlscript.mk |1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cec32a4ea3a040003d21981e5feae1857e970b91
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 16:24:42 2013 +0300

Add tl for DbgUnhandledException()

Change-Id: I612f0e473280342f4e406ebee7002a40622fbbf0
(cherry picked from commit 0dfa58bdd9bd2ee12fe00674e7a9a1b55939a84b)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 8c33fda..263d0b1 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,macab1,\
dbtools \
sal \
salhelper \
+   tl \
 ))
 
 $(eval $(call gb_Library_set_include,macab1,\
commit 2f4ae00307041232a9b6bcddc393b0ee5b14b379
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 14:45:32 2013 +0200

more linking fix

for my diagose_ex.h change

Change-Id: I6f9224942b5ccac0ae6b61a595bfe6a3c7463b7b
(cherry picked from commit dbcc5bc9d936533794c194d7d33c59c840e76b68)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 5f7782b..4a301b6 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,kab1,\
dbtools \
sal \
salhelper \
+   tl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,kab1,\
commit aed72ecb2805117c52645b38fce274fc9a4af619
Author: Noel Grandin n...@peralex.com
Date:   Tue May 21 13:50:45 2013 +0200

fix for linking

caused by my commit
863d38fbfa4fb4861e476828c46410602100919e move DBG_UNHANDLED_EXCEPTION out 
of line

Change-Id: Idfd84d987ba9151ba476ce0516a9e5fbdb2003ec
(cherry picked from commit 6bf00f0f94394c62bddcd77b776e4e3592160201)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 9222bc5..68282c0 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
salhelper \
jvmaccess \
dbtools \
+   tl \
utl \
jvmfwk \
comphelper \
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 4041049..18917c5 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,mork, \
 dbtools \
 sal \
 salhelper \
+tl \
 utl \
$(gb_UWINAPI) \
 ))
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index e8da462..146b966 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
dbtools \
utl \
sal \
+   tl \
$(gb_UWINAPI) \
 ))
 
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index d0a9518..1227f9d 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,log,\
cppuhelper \
cppu \
sal \
+   tl \
$(gb_UWINAPI) \
 ))
 
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index a38b2d4..4c27193 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -40,8 +40,9 @@
 #include osl/thread.h
 #include boost/current_function.hpp
 #include typeinfo
+#include tools/toolsdllapi.h
 
-void DbgUnhandledException(const ::com::sun::star::uno::Any 
caughtException, const char* currentFunction);
+TOOLS_DLLPUBLIC void DbgUnhandledException(const 
::com::sun::star::uno::Any caughtException, const char* currentFunction);
 
 /** reports a caught UNO exception via OSL diagnostics
 
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index eec15eb..3f950ca 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1589,7 +1589,7 @@ void DbgOutf( const sal_Char*, ... ) {}
 
 #if OSL_DEBUG_LEVEL  0
 
-void DbgUnhandledException(const css::uno::Any  caught, const char* 
currentFunction)
+TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any  caught, const 
char* currentFunction)
 {
 OString sMessage( caught an exception! );
 sMessage += \nin function:;
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 

[Libreoffice-commits] core.git: include/sal

[Marcos Paulo de Souza]

 include/sal/log-areas.dox |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3d77112ceb6b49b0bba00832cd75d9a03ee8af26
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue May 21 10:49:27 2013 -0300

Remove dead log-area

The nullcanvas was removed in 1cd9b5d859a6468164b043b0fcaaf49c1907500c

Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7
Reviewed-on: https://gerrit.libreoffice.org/3992
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 90eeecd..6db37e5 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -42,7 +42,6 @@ certain functionality.
 
 @li @c canvas
 @li @c canvas.cairo
-@li @c canvas.null
 @li @c canvas.vcl
 
 @section chart2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Adam Co]

 sw/source/filter/ww8/docxexport.cxx |   22 ++
 sw/source/filter/ww8/docxexport.hxx |1 +
 2 files changed, 23 insertions(+)

New commits:
commit dd0b079c9298331a090e3690a85321781d16ed3c
Author: Adam Co rattles2...@gmail.com
Date:   Tue May 21 16:48:56 2013 +0300

fdo#64826: fix for exporting to DOCX that didnt save track 'changes state'

Change-Id: If5b3198769a08cc751d542f8305fd7f41c73ec26
Reviewed-on: https://gerrit.libreoffice.org/3991
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 9840c45..ca46cae 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -686,18 +686,33 @@ void DocxExport::WriteSettings()
 // Zoom
 OString 
aZoom(OString::valueOf(sal_Int32(pViewShell-GetViewOptions()-GetZoom(;
 pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
+
+// Track Changes
+if ( settings.trackRevisions )
+pFS-singleElementNS( XML_w, XML_trackRevisions, FSEND );
+
+// Embed Fonts
 if( pDoc-get( IDocumentSettingAccess::EMBED_FONTS ))
 pFS-singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND );
+
+// Embed System Fonts
 if( pDoc-get( IDocumentSettingAccess::EMBED_SYSTEM_FONTS ))
 pFS-singleElementNS( XML_w, XML_embedSystemFonts, FSEND );
+
+// Default Tab Stop
 if( settings.defaultTabStop != 0 )
 pFS-singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val 
),
 OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), 
FSEND );
+
+// Even and Odd Headers
 if( settings.evenAndOddHeaders )
 pFS-singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND );
 
+// Has Footnotes
 if( m_pAttrOutput-HasFootnotes())
 m_pAttrOutput-WriteFootnoteEndnotePr( pFS, XML_footnotePr, 
pDoc-GetFtnInfo(), XML_footnote );
+
+// Has Endnotes
 if( m_pAttrOutput-HasEndnotes())
 m_pAttrOutput-WriteFootnoteEndnotePr( pFS, XML_endnotePr, 
pDoc-GetEndNoteInfo(), XML_endnote );
 
@@ -809,6 +824,9 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc 
*pDocument, SwPaM *pCur
   m_nFooters( 0 ),
   m_pVMLExport( NULL )
 {
+// Set the 'Track Revisions' flag in the settings structure
+settings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON  
mnRedlineMode );
+
 // Write the document properies
 WriteProperties( );
 
@@ -840,6 +858,7 @@ DocxExport::~DocxExport()
 DocxSettingsData::DocxSettingsData()
 : evenAndOddHeaders( false )
 , defaultTabStop( 0 )
+, trackRevisions( false )
 {
 }
 
@@ -849,6 +868,9 @@ bool DocxSettingsData::hasData() const
 return true;
 if( defaultTabStop != 0 )
 return true;
+if ( trackRevisions )
+return true;
+
 return false;
 }
 
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 16bf73e..2348349 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -54,6 +54,7 @@ struct DocxSettingsData
 bool hasData() const; /// returns true if there are any non-default 
settings (i.e. something to write)
 bool evenAndOddHeaders;
 int defaultTabStop;
+bool trackRevisions;// Should 'Track Revisions' be set
 };
 
 /// The class that does all the actual DOCX export-related work.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Remove dead log-area

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3992

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3992/1

Remove dead log-area

The nullcanvas was removed in 1cd9b5d859a6468164b043b0fcaaf49c1907500c

Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7
---
M include/sal/log-areas.dox
1 file changed, 0 insertions(+), 1 deletion(-)



diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 90eeecd..6db37e5 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -42,7 +42,6 @@
 
 @li @c canvas
 @li @c canvas.cairo
-@li @c canvas.null
 @li @c canvas.vcl
 
 @section chart2

-- 
To view, visit https://gerrit.libreoffice.org/3992
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Remove dead log-area

[Tor Lillqvist (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3992

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3992
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#64826: fix for exporting to DOCX that didnt save track '...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3991

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3991
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5b3198769a08cc751d542f8305fd7f41c73ec26
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/inc sd/source sfx2/source

[Oliver-Rainer Wittmann]

 sal/inc/sal/mathconf.h|9 -
 sd/source/ui/dlg/navigatr.cxx |   17 ++---
 sfx2/source/sidebar/DeckDescriptor.cxx|6 ++
 sfx2/source/sidebar/DeckLayouter.cxx  |2 +-
 sfx2/source/sidebar/PanelDescriptor.cxx   |6 ++
 sfx2/source/sidebar/ResourceManager.cxx   |   11 +--
 sfx2/source/sidebar/SidebarController.cxx |2 ++
 7 files changed, 46 insertions(+), 7 deletions(-)

New commits:
commit 1aead9f230e3953f6049e1700d912d6c14c62e7f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue May 21 13:31:56 2013 +

122260: Calc Navigator - assure that tool box is at least as wide as the 
tree list box to avoid 'bad' layout when the Navigator is resized.

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 390726a..ced4e75 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -106,7 +106,8 @@ SdNavigatorWin::SdNavigatorWin(
 maToolbox.SetItemBits( TBI_DRAGTYPE, maToolbox.GetItemBits( TBI_DRAGTYPE ) 
| TIB_DROPDOWNONLY );
 
 // Shape filter drop down menu.
-maToolbox.SetItemBits(TBI_SHAPE_FILTER,
+maToolbox.SetItemBits(
+TBI_SHAPE_FILTER,
 maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY);
 
 // TreeListBox
@@ -125,8 +126,18 @@ SdNavigatorWin::SdNavigatorWin(
 nListboxYPos = maTlbObjects.GetPosPixel().Y() + 
maTlbObjects.GetSizePixel().Height() + 4;
 maLbDocs.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
 
+// assure that tool box is at least as wide as the tree list box
+{
+const Size aTlbSize( maTlbObjects.GetOutputSizePixel() );
+if ( aTlbSize.Width()  aTbxSize.Width() )
+{
+maToolbox.SetPosSizePixel( 0, 0, aTlbSize.Width(), 0, 
WINDOW_POSSIZE_WIDTH );
+aTbxSize = maToolbox.GetOutputSizePixel();
+}
+}
+
 // set min outputsize after all sizes are known
-long nFullHeight = nListboxYPos + maLbDocs.GetSizePixel().Height() + 4;
+const long nFullHeight = nListboxYPos + maLbDocs.GetSizePixel().Height() + 
4;
 maSize = GetOutputSizePixel();
 if( maSize.Height()  nFullHeight )
 {
@@ -134,7 +145,7 @@ SdNavigatorWin::SdNavigatorWin(
 SetOutputSizePixel( maSize );
 }
 maMinSize = maSize;
-long nMinWidth = 2*maToolbox.GetPosPixel().X() + aTbxSize.Width(); // 
never clip the toolbox
+const long nMinWidth = 2*maToolbox.GetPosPixel().X() + aTbxSize.Width(); 
// never clip the toolbox
 if( nMinWidth  maMinSize.Width() )
 maMinSize.Width() = nMinWidth;
 maMinSize.Height() -= 40;
commit ff4875ae18c417a74621559bd2d2e9ad05929a82
Author: Andre Fischer a...@apache.org
Date:   Tue May 21 13:29:49 2013 +

i122057: Fixed layouting of legacy sidebar panels.

diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx 
b/sfx2/source/sidebar/DeckDescriptor.cxx
index 8727402..2fa2823 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -30,9 +30,12 @@ DeckDescriptor::DeckDescriptor (void)
   msId(),
   msIconURL(),
   msHighContrastIconURL(),
+  msTitleBarIconURL(),
+  msHighContrastTitleBarIconURL(),
   msHelpURL(),
   msHelpText(),
   maContextList(),
+  mbIsEnabled(true),
   mnOrderIndex(1) // Default value as defined in Sidebar.xcs
 {
 }
@@ -45,9 +48,12 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor rOther)
   msId(rOther.msId),
   msIconURL(rOther.msIconURL),
   msHighContrastIconURL(rOther.msHighContrastIconURL),
+  msTitleBarIconURL(rOther.msTitleBarIconURL),
+  msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
   msHelpURL(rOther.msHelpURL),
   msHelpText(rOther.msHelpText),
   maContextList(rOther.maContextList),
+  mbIsEnabled(rOther.mbIsEnabled),
   mnOrderIndex(rOther.mnOrderIndex)
 {
 }
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 4b2fc18..7154b52 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -328,7 +328,7 @@ void DeckLayouter::GetRequestedSizes (
 if (xPanel.is())
 aLayoutSize = 
xPanel-getHeightForWidth(rContentBox.GetWidth());
 else
-aLayoutSize = ui::LayoutSize(MinimalPanelHeight, 0, -1);
+aLayoutSize = ui::LayoutSize(MinimalPanelHeight, -1, 0);
 }
 }
 iItem-maLayoutSize = aLayoutSize;
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx 
b/sfx2/source/sidebar/PanelDescriptor.cxx
index 20a460f..a602fa0 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -31,10 +31,13 @@ PanelDescriptor::PanelDescriptor (void)
   mbIsTitleBarOptional(false),
   msId(),
   msDeckId(),
+  msTitleBarIconURL(),
+  msHighContrastTitleBarIconURL(),

[Libreoffice-commits] core.git: 2 commits - sc/source sd/source

[Tor Lillqvist]

 sc/source/ui/sidebar/CellBorderStyleControl.cxx |3 ---
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx  |2 --
 sd/source/ui/view/drviews2.cxx  |2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 66c315bcf2b78c4928d1e436d1a853f58f4cccdb
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 17:05:42 2013 +0300

WaE: unused variables

Change-Id: I52d43a35e621636175e6c56bc068837d3a84bec4

diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx 
b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 867d1c0..85ffd6f 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -137,7 +137,6 @@ void CellBorderStyleControl::Initialize()
 IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
 {
 sal_uInt16 nId = pToolBox-GetCurItemId();
-::Color aColBlack( COL_BLACK );
 SvxBoxItem  aBorderOuter( SID_ATTR_BORDER_OUTER );
 SvxBoxInfoItem  aBorderInner( SID_ATTR_BORDER_INNER );
 editeng::SvxBorderLine theDefLine(NULL, 1);
@@ -198,7 +197,6 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, 
pToolBox)
 
 if( nId != TBI_BORDER2_BLTR  nId != TBI_BORDER2_TLBR )
 {
-::Color aColBlack( COL_BLACK );
 SvxBoxItem  aBorderOuter( SID_ATTR_BORDER_OUTER );
 SvxBoxInfoItem  aBorderInner( SID_ATTR_BORDER_INNER );
 editeng::SvxBorderLine theDefLine(NULL, 1);
@@ -282,7 +280,6 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, 
pToolBox)
 {
 sal_uInt16 nId = pToolBox-GetCurItemId();
 
-::Color aColBlack( COL_BLACK );
 SvxBoxItem  aBorderOuter( SID_ATTR_BORDER_OUTER );
 SvxBoxInfoItem  aBorderInner( SID_ATTR_BORDER_INNER );
 editeng::SvxBorderLine *pTop = 0 ,
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx 
b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index 4f823f0..fc8e5e5 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -95,8 +95,6 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent 
rUDEvt )
 aSize.Height() = nRectHeight*3/5;
 aFont.SetSize( aSize );
 
-Point aLineStart(aBLPos.X() + 5,aBLPos.Y() + ( nRectHeight - 
nItemId )/2);
-Point aLineEnd(aBLPos.X() + nRectWidth * 7 / 9 - 15, aBLPos.Y() + ( 
nRectHeight - nItemId )/2);
 long  nTLX = aBLPos.X() + 5,  nTLY = aBLPos.Y() + ( nRectHeight - nItemId 
)/2;
 long  nTRX = aBLPos.X() + nRectWidth * 7 / 9 - 15, nTRY = aBLPos.Y() + ( 
nRectHeight - nItemId )/2;
 
commit ce575889b9c46e98544c9f6f30372ac7e05e20c5
Author: Tor Lillqvist t...@iki.fi
Date:   Tue May 21 17:00:18 2013 +0300

Fix warning: statement aligned ... [loplugin]

Change-Id: Ie092f3e1a6362089feec90f6aef6c73f23d13935

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 4e44fb7..835cc93 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2876,7 +2876,7 @@ void DrawViewShell::ExecChar( SfxRequest rReq )
 {
 SdDrawDocument* pDoc = GetDoc();
 if (!pDoc || !mpDrawView)
-return;
+return;
 
 SfxItemSet aEditAttr( pDoc-GetPool() );
 mpDrawView-GetAttributes( aEditAttr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations

[Petr Mladek]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9277c1817328a1c780c43e212834c87d1c735d2b
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 13:36:57 2013 +0200

Updated core
Project: translations  fe52a1bfe9f6ca11a1e19c150fe9550aa13ea40d

diff --git a/translations b/translations
index aca7d4c..fe52a1b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit aca7d4c043342f9ccf86215e1949543e92faf00b
+Subproject commit fe52a1bfe9f6ca11a1e19c150fe9550aa13ea40d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/sv source/te source/uz

[Petr Mladek]

 source/sv/scp2/source/accessories.po |2 +-
 source/te/scp2/source/impress.po |2 +-
 source/uz/scp2/source/writer.po  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fe52a1bfe9f6ca11a1e19c150fe9550aa13ea40d
Author: Petr Mladek pmla...@suse.cz
Date:   Tue May 21 13:36:57 2013 +0200

fix typos when translating srings with %PRODUCTNAME macro

Change-Id: I7ee8893e956c4e1d858cf1cde1f29e1c70dab9d6

diff --git a/source/sv/scp2/source/accessories.po 
b/source/sv/scp2/source/accessories.po
index aa346d2..8bad9ee 100644
--- a/source/sv/scp2/source/accessories.po
+++ b/source/sv/scp2/source/accessories.po
@@ -1901,7 +1901,7 @@ msgctxt 
 STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT\n
 LngText.text
 msgid %PRODUCTNAME advertisement materials.
-msgstr Reklammaterial för %PRODUKTNAMN.
+msgstr Reklammaterial för %PRODUCTNAME.
 
 #: module_samples_accessories.ulf
 msgctxt 
diff --git a/source/te/scp2/source/impress.po b/source/te/scp2/source/impress.po
index 16091bc..bb33ace 100644
--- a/source/te/scp2/source/impress.po
+++ b/source/te/scp2/source/impress.po
@@ -77,7 +77,7 @@ msgctxt 
 STR_DESC_MODULE_PRG_IMPRESS_BIN\n
 LngText.text
 msgid The application %PRODUCTNAME Impress
-msgstr %%PRODUCTNAME ముద్ర 
కార్యక్షేత్రము
+msgstr %PRODUCTNAME ముద్ర 
కార్యక్షేత్రము
 
 #: module_impress.ulf
 msgctxt 
diff --git a/source/uz/scp2/source/writer.po b/source/uz/scp2/source/writer.po
index fbe1fe1..96fa33d 100644
--- a/source/uz/scp2/source/writer.po
+++ b/source/uz/scp2/source/writer.po
@@ -28,7 +28,7 @@ msgctxt 
 STR_DESC_MODULE_PRG_WRT\n
 LngText.text
 msgid Create and edit text and graphics in letters, reports, documents and 
Web pages by using %PRODUCTNAME Writer.
-msgstr %PRODUCTNAM Writer yordamida xatlar uchun matnlar, hisobotlar, 
hujjatlar yoki veb sahifalar yaratish.
+msgstr %PRODUCTNAME Writer yordamida xatlar uchun matnlar, hisobotlar, 
hujjatlar yoki veb sahifalar yaratish.
 
 #: module_writer.ulf
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] buildbot.git: bin/tinbuild2

[Norbert Thiebaud]

 bin/tinbuild2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ef62edfb144f28d88b95ef798dcd8404413b556
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Tue May 21 09:10:08 2013 -0500

add support for libreoffice-4-1 in tinbuild2

diff --git a/bin/tinbuild2 b/bin/tinbuild2
index 57d2a6c..c2790c5 100755
--- a/bin/tinbuild2
+++ b/bin/tinbuild2
@@ -521,6 +521,7 @@ else
 libreoffice-3-5) TINDER_BRANCH=$B ;;
 libreoffice-3-6) TINDER_BRANCH=$B ;;
 libreoffice-4-0) TINDER_BRANCH=$B ;;
+libreoffice-4-1) TINDER_BRANCH=$B ;;
 *)
 if [ ${MODE} = prime -o ${MODE} = gerrit-patch -o ${MODE?} = 
gerrit ] ; then
 TINDER_BRANCH=$B
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'tinderbox' - local_conf/TreeData.pm

[Christian Lohmaier]

 local_conf/TreeData.pm |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f2240e9d417b0ddd3227652b01e7f83747784f92
Author: Christian Lohmaier lohmaier+git...@googlemail.com
Date:   Tue May 21 16:10:26 2013 +0200

new branch libreoffice-4-1

diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index d30c7fb..31a03fb 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -231,6 +231,12 @@ $VERSION = '#tinder_version#';
branch = 'master',
VCS  = 'GIT',
   },
+'libreoffice-4-1' =  {
+   root = 
'git://anongit.freedesktop.org/git/libreoffice/core',
+   module = 'all',
+   branch = 'libreoffice-4-1',
+   VCS  = 'GIT',
+  },
 'libreoffice-4-0' =  {
root = 
'git://anongit.freedesktop.org/git/libreoffice/core',
module = 'all',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source

[Stephan Bergmann]

 extensions/source/update/check/updatehdl.cxx |   27 +--
 extensions/source/update/check/updatehdl.hxx |2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit cb4b6dde8fda2a5848e11063028bf44d72f85431
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 16:29:31 2013 +0200

-Werror,-Wuninitialized

Bogus

  uno::Reference awt::XControlModel  xControlModel = xControlModel;

introduced with 6c61b20a8d4a6dcac28801cde82a211fb7e30654 fdo#46808, Convert
awt::UnoControlDialogModel to new style.  Correct fix involves adding 
missing
const in declaration of UpdateHandler::insertControlModel, so implicit
Reference up-cast works.

Change-Id: I8f6d679a38d99188eb893366e9b552974b3c1bf2

diff --git a/extensions/source/update/check/updatehdl.cxx 
b/extensions/source/update/check/updatehdl.cxx
index 1852581..6c96e6e 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -819,7 +819,7 @@ void UpdateHandler::focusControl( DialogControls eID )
 }
 
 //
-void UpdateHandler::insertControlModel( uno::Reference awt::XControlModel   
rxDialogModel,
+void UpdateHandler::insertControlModel( uno::Reference awt::XControlModel  
const  rxDialogModel,
 OUString const  rServiceName,
 OUString const  rControlName,
 awt::Rectangle const  rPosSize,
@@ -1093,23 +1093,22 @@ void UpdateHandler::createDialog()
 
 loadStrings();
 
-uno::Reference awt::XUnoControlDialogModel  xControlDialogModel = 
awt::UnoControlDialogModel::create( mxContext );
+uno::Reference awt::XUnoControlDialogModel  xControlModel = 
awt::UnoControlDialogModel::create( mxContext );
 {
 // @see awt/UnoControlDialogModel.idl
-xControlDialogModel-setTitle( msDlgTitle);
-xControlDialogModel-setCloseable( true );
-xControlDialogModel-setEnabled( true );
-xControlDialogModel-setMoveable( true );
-xControlDialogModel-setSizeable( true );
-xControlDialogModel-setDesktopAsParent( true );
-xControlDialogModel-setPositionX( 100 );
-xControlDialogModel-setPositionY( 100 );
-xControlDialogModel-setWidth( DIALOG_WIDTH );
-xControlDialogModel-setHeight( DIALOG_HEIGHT );
-xControlDialogModel-setHelpURL( INET_HID_SCHEME + 
OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) );
+xControlModel-setTitle( msDlgTitle);
+xControlModel-setCloseable( true );
+xControlModel-setEnabled( true );
+xControlModel-setMoveable( true );
+xControlModel-setSizeable( true );
+xControlModel-setDesktopAsParent( true );
+xControlModel-setPositionX( 100 );
+xControlModel-setPositionY( 100 );
+xControlModel-setWidth( DIALOG_WIDTH );
+xControlModel-setHeight( DIALOG_HEIGHT );
+xControlModel-setHelpURL( INET_HID_SCHEME + 
OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) );
 }
 
-uno::Reference awt::XControlModel  xControlModel = xControlModel;
 {   // Label (fixed text) status
 uno::Sequence beans::NamedValue  aProps(1);
 
diff --git a/extensions/source/update/check/updatehdl.hxx 
b/extensions/source/update/check/updatehdl.hxx
index 39804a7..661b6a8 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -149,7 +149,7 @@ private:
 static void setProperty( com::sun::star::uno::Sequence 
com::sun::star::beans::NamedValue  rProps,
  const int nIndex, const OUString 
rPropName, const com::sun::star::uno::Any rPropValue )
  { rProps[ nIndex ].Name = rPropName; 
rProps[ nIndex ].Value = rPropValue; }
-static void insertControlModel( 
com::sun::star::uno::Reference com::sun::star::awt::XControlModel   
rxDialogModel,
+static void insertControlModel( 
com::sun::star::uno::Reference com::sun::star::awt::XControlModel  const  
rxDialogModel,
 OUString const  rServiceName,
 OUString const  rControlName,
 com::sun::star::awt::Rectangle 
const  rPosSize,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: checking external lib versions

[Bjoern Michaelsen]

On Tue, May 21, 2013 at 08:16:44AM -0400, Kohei Yoshida wrote:
 On 05/21/2013 08:10 AM, Bjoern Michaelsen wrote:
 Hi,
 
 On Sat, May 18, 2013 at 05:40:38PM -0400, Kohei Yoshida wrote:
 Trying to build libreoffice 4.0.3.3 with liborcus 0.5.1 and that
 unfortunately
 fails with:
 You can't build the 4.0 branch with 0.5.1. You need to use 0.3.0.
 As package maintainer, I have been repeatedly nagged about the versioning of
 the essentially TDF-hosted but officially external libs (not only orcus, but
 also wp*, cmis and friends). Proper versioning would go with full so-name
 versioning for ABI-changes etc.
 FWIW, liborcus clearly defines API version.  The one for 4.0 is
 liborcus-4.0, and the one for the master is liborcus-6.0. Is there
 anything else you are suggesting we do?

Hmm, indeed:
$ readelf -d /usr/lib/liborcus-0.4.so.0|grep soname
 0x000e (SONAME) Library soname: [liborcus-0.4.so.0]

I need to check which libs that nagging was about.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla.pl

[Markus Mohrhard]

 ciabot/libreoffice-bugzilla.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f6bd5e8f03113023c1162efb1a4669ec7c21517
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue May 21 16:35:43 2013 +0200

update master target for git bugzilla script

diff --git a/ciabot/libreoffice-bugzilla.pl b/ciabot/libreoffice-bugzilla.pl
index 560b6bf..81d7713 100755
--- a/ciabot/libreoffice-bugzilla.pl
+++ b/ciabot/libreoffice-bugzilla.pl
@@ -29,7 +29,7 @@ my $bug_regex = 'fdo#(\d+)';
 
 # This contains the target version for all commits to master
 # Adjust it if a new version branch has been created
-my $master_target = '4.1.0';
+my $master_target = '4.2.0';
 
 
 # End user configurable section
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - odk/Package_autodoc.mk

[Stephan Bergmann]

 odk/Package_autodoc.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4b44ca511900772da30b5a938250789d80d24dfe
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 14:57:05 2013 +0200

Adapt to new com/sun/star/oox/

...introduced by a986eddb9b9d1de71ae1c6f73246e493cc449c21 fdo#46808, 
Convert
oox.ExcelFilterExport service to new style.

Change-Id: Ie44688f02ffb73ff5967b66e649827058236614e
(cherry picked from commit 6aa19bf090ac03fcb55479155abb0d59f43d766a)

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/odk/Package_autodoc.mk b/odk/Package_autodoc.mk
index bd1117b..b73e7ba 100644
--- a/odk/Package_autodoc.mk
+++ b/odk/Package_autodoc.mk
@@ -107,6 +107,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME)
com/sun/star/media \
com/sun/star/mozilla \
com/sun/star/office \
+   com/sun/star/oox \
com/sun/star/packages \
com/sun/star/packages/manifest \
com/sun/star/packages/zip \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests

[Stephan Bergmann]

 qadevOOo/runner/util/AccessibilityTools.java|  100 
+-
 qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java |4 
 qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java |4 
 3 files changed, 18 insertions(+), 90 deletions(-)

New commits:
commit 89fbed7e29104bf189dc3d75dc11a8aadd362322
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 16:40:03 2013 +0200

Revert Java cleanup, AccessibilityTools..

This reverts commit d702dd4396161f8e2e7396f5c24554088b752fcb, which 
reproducibly
broke JunitTest_sc_unoapi:

java.lang.NullPointerException
 at 
util.AccessibilityTools.getAccessibleObjectForRole_(AccessibilityTools.java:177)
 at 
util.AccessibilityTools.getAccessibleObjectForRole(AccessibilityTools.java:95)
 at 
mod._sc.AccessibleEditableTextPara_PreviewCell.createTestEnvironment(AccessibleEditableTextPara_PreviewCell.java:149)
 at lib.TestCase.getTestEnvironment(TestCase.java:121)
 at base.java_fat.getTestEnvironment(java_fat.java:319)
 at base.java_fat.executeTest(java_fat.java:167)
 at org.openoffice.Runner.run(Runner.java:234)
 at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38)
 at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
 at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 at java.lang.reflect.Method.invoke(Method.java:601)
 at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45)
 at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
 at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42)
 at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
 at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
 at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30)
 at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47)
 at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
 at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
 at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
 at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
 at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
 at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
 at org.junit.runners.Suite.runChild(Suite.java:128)
 at org.junit.runners.Suite.runChild(Suite.java:24)
 at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
 at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
 at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
 at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
 at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
 at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:157)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:136)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:117)
 at org.junit.runner.JUnitCore.runMain(JUnitCore.java:98)
 at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:53)
 at org.junit.runner.JUnitCore.main(JUnitCore.java:45)

Change-Id: I3601fe24db21bd63f7dc6cdf0a1eb69f447d962a

diff --git a/qadevOOo/runner/util/AccessibilityTools.java 
b/qadevOOo/runner/util/AccessibilityTools.java
index c7cb483..85cd442 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -17,7 +17,6 @@
  */
 package util;
 
-import com.sun.star.accessibility.AccessibleStateType;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.accessibility.XAccessibleContext;
@@ -33,7 +32,7 @@ import java.io.PrintWriter;
 
 
 public class AccessibilityTools {
-private XAccessible SearchedAccessible = null;
+public static XAccessible SearchedAccessible = null;
 private static boolean debug = false;
 
 public AccessibilityTools() {
@@ -92,12 +91,15 @@ public class AccessibilityTools {
 
 public static XAccessibleContext getAccessibleObjectForRole(XAccessible 
xacc,
 short role) {
+SearchedAccessible = null;
 return getAccessibleObjectForRole_(xacc, role);
 }
 
 public static XAccessibleContext getAccessibleObjectForRole(XAccessible 
xacc,
 short role,
 boolean ignoreShowing) {
+SearchedAccessible = null;
+
 if (ignoreShowing) {
   

[Libreoffice-commits] core.git: languagetool/ExternalProject_languagetool.mk

[Stephan Bergmann]

 languagetool/ExternalProject_languagetool.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 90e2ad99a594c185ccc578c36121da83eaf8885f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 17:02:09 2013 +0200

Missing dependencies

cf. the various ext.ooo.*.lib in the tarball's build.xml

Change-Id: If58534c78b04768ab2d0524079d70bdd8ad16c00

diff --git a/languagetool/ExternalProject_languagetool.mk 
b/languagetool/ExternalProject_languagetool.mk
index fdee1ad..1035bb6 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -13,7 +13,11 @@ $(eval $(call 
gb_ExternalProject_register_targets,languagetool,\
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,languagetool,build) : $(call 
gb_Jar_get_outdir_target,juh)
+$(call gb_ExternalProject_get_state_target,languagetool,build) : \
+$(call gb_Jar_get_outdir_target,juh) \
+$(call gb_Jar_get_outdir_target,jurt) \
+$(call gb_Jar_get_outdir_target,ridl) \
+$(call gb_Jar_get_outdir_target,unoil)
cd $(call gb_UnpackedTarball_get_dir,languagetool)  \
$(ICECREAM_RUN) $(ANT) \
-q \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CPU-loop on Mac on libreoffice-4-1

[Norbert Thiebaud]

On Tue, May 21, 2013 at 10:05 AM, Norbert Thiebaud nthieb...@gmail.com wrote:
 I did a test build and run some manual test on 4-1

 I noticed a cpu-loop. apparently one thread went rogue:
 attached some debugging info (process 'sample' generated by the
 Activity Monitor)


and for bonus point... it crash when I quit

Process: soffice [12973]
Path:
/Volumes/LibreOfficeDev/LibreOfficeDev.app/Contents/MacOS/soffice
Identifier:  org.libreoffice.script
Version: 4.1.0.0.alpha1 (???)
Code Type:   X86 (Native)
Parent Process:  launchd [322]

Date/Time:   2013-05-21 10:11:31.345 -0500
OS Version:  Mac OS X 10.6.8 (10K549)
Report Version:  6

Interval Since Last Report:  1116616 sec
Crashes Since Last Report:   4
Per-App Interval Since Last Report:  1137 sec
Per-App Crashes Since Last Report:   1
Anonymous UUID:  80DA7628-1FAC-4CFF-BDEB-C2B268BC8FB5

Exception Type:  EXC_BAD_ACCESS (SIGBUS)
Exception Codes: KERN_PROTECTION_FAILURE at 0x0410
Crashed Thread:  5

Thread 0:  Dispatch queue: com.apple.main-thread
0   libconfigmgrlo.dylib0x0a23821b
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 59
1   libconfigmgrlo.dylib0x0a25c69a
configmgr::SetNode::~SetNode() + 58
2   libconfigmgrlo.dylib0x0a238228
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 72
3   libconfigmgrlo.dylib0x0a24f750
configmgr::GroupNode::~GroupNode() + 64
4   libconfigmgrlo.dylib0x0a238228
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 72
5   libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 34
6   libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 34
7   libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 34
8   libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 34
9   libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  *) + 34
10  libconfigmgrlo.dylib0x0a238202
std::_Rb_treertl::OUString, std::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node ,
std::_Select1ststd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  , std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const,
rtl::Referenceconfigmgr::Node  
::_M_erase(std::_Rb_tree_nodestd::pairrtl::OUString const,

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic

[Caolán McNamara]

 vcl/generic/fontmanager/fontconfig.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit f3db0733b5007ca64a6d755f603970edc5dfd5c4
Author: Caolán McNamara caol...@redhat.com
Date:   Mon May 20 20:37:27 2013 +0100

absoletely guarantee there is no mem leak

Change-Id: If6960dea479bb8970cb94aa05a3c9d44bf60cfc5
(cherry picked from commit 1704b1200d39eba8e235ca5c13c5a931d07a98b3)

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index 3e23fc9..1b36980 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -806,20 +806,18 @@ namespace
 OString mapToFontConfigLangTag(const LanguageTag rLangTag)
 {
 #if defined(FC_VERSION)  (FC_VERSION = 20492)
-FcStrSet *pLangSet = FcGetLangs();
+boost::shared_ptrFcStrSet xLangSet(FcGetLangs(), FcStrSetDestroy);
 OString sLangAttrib;
 
 sLangAttrib = OUStringToOString(rLangTag.getBcp47(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
-if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+if (FcStrSetMember(xLangSet.get(), (const 
FcChar8*)sLangAttrib.getStr()))
 {
-FcStrSetDestroy(pLangSet);
 return sLangAttrib;
 }
 
 sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
-if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+if (FcStrSetMember(xLangSet.get(), (const 
FcChar8*)sLangAttrib.getStr()))
 {
-FcStrSetDestroy(pLangSet);
 return sLangAttrib;
 }
 
@@ -829,16 +827,14 @@ namespace
 if (!sRegion.isEmpty())
 {
 sLangAttrib = sLang + OString('-') + sRegion;
-if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+if (FcStrSetMember(xLangSet.get(), (const 
FcChar8*)sLangAttrib.getStr()))
 {
-FcStrSetDestroy(pLangSet);
 return sLangAttrib;
 }
 }
 
-if (FcStrSetMember(pLangSet, (const FcChar8*)sLang.getStr()))
+if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLang.getStr()))
 {
-FcStrSetDestroy(pLangSet);
 return sLang;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits