Library_merged.mk | 1 +
solenv/gbuild/extensions/pre_MergedLibsList.mk | 8 ++++++++
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 6 +++---
xmlsecurity/source/dialogs/macrosecurity.cxx | 10 +++++-----
4 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 526c32e6909b6955e72f34d86e0aa6a88d74370c
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 20:35:18 2013 -0400
add chartcore to Library_merged
Change-Id: I27c27556e25e2233eea0406e20afe0531ed638e7
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 0f17458..117c0df 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -31,6 +31,7 @@ ifeq ($(MERGELIBS),TRUE)
gb_MERGEDLIBS := \
avmedia \
canvastools \
+ chartcore \
configmgr \
cppcanvas \
cui \
commit 9e9dc4f4bae26533ebde9ffbcb5ee31a85203194
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 20:29:16 2013 -0400
add localedata to Library_merged
Change-Id: If7896fc49c38f41b370d569a90b02148dcbcbfd6
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index d5e8f17..0f17458 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -52,6 +52,10 @@ gb_MERGEDLIBS := \
i18nutil \
lng \
localebe1 \
+ localedata_en \
+ localedata_es \
+ localedata_euro \
+ localedata_others \
msfilter \
oox \
package2 \
commit 9cac6577496d0aa5ee22720239fcd18fcde85a02
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 20:22:47 2013 -0400
add cui to Library_merged
Change-Id: I485426c0a0792e17bae5ef125d69f52827b469b2
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 4c7c229..d5e8f17 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -33,6 +33,7 @@ gb_MERGEDLIBS := \
canvastools \
configmgr \
cppcanvas \
+ cui \
$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 8dc691e..9f79955 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -42,11 +42,11 @@ namespace dcss = ::com::sun::star;
class MacroSecurityTP;
-class ReadOnlyImage : public FixedImage
+class XmlReadOnlyImage : public FixedImage
{
public:
- ReadOnlyImage(Window* pParent, const ResId rResId);
- ~ReadOnlyImage();
+ XmlReadOnlyImage(Window* pParent, const ResId rResId);
+ ~XmlReadOnlyImage();
virtual void RequestHelp( const HelpEvent& rHEvt );
static const OUString& GetHelpTip();
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx
b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 3a0a745..0063b0f 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -433,17 +433,17 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
}
-ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
+XmlReadOnlyImage::XmlReadOnlyImage(Window* pParent, const ResId rResId) :
FixedImage(pParent, rResId)
{
SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
}
-ReadOnlyImage::~ReadOnlyImage()
+XmlReadOnlyImage::~XmlReadOnlyImage()
{
}
-void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
+void XmlReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
{
if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() )
{
@@ -451,7 +451,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
Rectangle aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
OutputToScreenPixel(
aLogicPix.BottomRight() ) );
- OUString aStr(ReadOnlyImage::GetHelpTip());
+ OUString aStr(XmlReadOnlyImage::GetHelpTip());
if ( Help::IsBalloonHelpEnabled() )
Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
aStr );
@@ -462,7 +462,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
Window::RequestHelp( rHEvt );
}
-const OUString& ReadOnlyImage::GetHelpTip()
+const OUString& XmlReadOnlyImage::GetHelpTip()
{
static OUString aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
return aStr;
commit 8726f878574b00fea9a47601e2c341b6f7d7aa37
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 20:12:13 2013 -0400
add writerfilter to Library_merged
Change-Id: I1b5c4450bd83bfb8b04e7129bd512a5f897f5bf9
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 246561f..4c7c229 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -79,6 +79,7 @@ gb_MERGEDLIBS := \
vcl \
$(if $(filter-out IOS,$(OS)),wpftdraw) \
$(if $(filter-out IOS,$(OS)),wpftwriter) \
+ writerfilter \
xmlscript \
xmlsecurity \
xo
commit 53ca5cd9932a079272a05204de76e126125e7b24
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 20:07:06 2013 -0400
add scfilt to Library_merged
Change-Id: Icebffb82b35ae383b97b0ef4b3419b1fe74ce858
diff --git a/Library_merged.mk b/Library_merged.mk
index 1e190b6..2a07894 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_externals,merged,\
libxml2 \
nss3 \
openssl \
+ orcus \
$(if $(filter-out IOS,$(OS)),\
cdr \
wpd \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e2167bc..246561f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -57,6 +57,7 @@ gb_MERGEDLIBS := \
sax \
sb \
sc \
+ scfilt \
sd \
sfx \
sofficeapp \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
