[Libreoffice-commits] .: 5 commits - fpicker/source lingucomponent/source reportdesign/source svx/source vcl/aqua
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Oct 24 08:30:34 PDT 2011
fpicker/source/aqua/ControlHelper.cxx | 4 -
fpicker/source/aqua/ControlHelper.hxx | 4 -
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 2
reportdesign/source/core/sdr/ReportDrawPage.cxx | 2
svx/source/form/fmdmod.cxx | 2
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 24 +++++------
6 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 6aaebef83fe1091baef5a6ace3cfec5f046bc68d
Author: Kristian Rietveld <kris at lanedo.com>
Date: Sat Oct 22 10:17:59 2011 +0200
Eliminate ambiguous conversion to cppu::OWeakObject
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 807919e..e4ecc37 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -49,7 +49,7 @@ using namespace ::svxform;
else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) )
{
SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
- xRet = *new SvxShapeControl(pObj);
+ xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj)));
}
if (!xRet.is())
xRet = SvxUnoDrawMSFactory::createInstance(ServiceSpecifier);
commit 93ef7cab14049576cdd24d2f749ef32c72c85ca9
Author: Kristian Rietveld <kris at lanedo.com>
Date: Sat Oct 22 10:16:19 2011 +0200
Eliminate ambiguous conversion to cppu::OWeakObject
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index d34b72d..aa2f6ff 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -93,7 +93,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
else
bChangeOrientation = pUnoObj->GetObjIdentifier() == OBJ_DLG_HFIXEDLINE;
SvxShapeControl* pShape = new SvxShapeControl( pObj );
- xShape.set(*pShape,uno::UNO_QUERY);
+ xShape.set(static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper *>(pShape)),uno::UNO_QUERY);
pShape->setShapeKind(pObj->GetObjIdentifier());
}
else if ( pObj->ISA(OCustomShape) )
commit 7d6097410cc18771112aa3aa4c7355e484f36628
Author: Kristian Rietveld <kris at lanedo.com>
Date: Sat Oct 22 09:49:38 2011 +0200
Use NSString in template specification instead of objc_object
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 97407f2..e7bf20f 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -156,7 +156,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
SvtPathOptions aPathOpt;
rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8;
- std::vector<objc_object *> postspdict;
+ std::vector<NSString *> postspdict;
std::vector<dictentry *> postupdict;
commit 45fca623fa3d050e72f5f759a9c97308a1c7d87e
Author: Kristian Rietveld <kris at lanedo.com>
Date: Sat Oct 22 09:40:55 2011 +0200
SystemFlavor NSStrings should not be const
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 2e2e0c2..d0146f8 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -89,18 +89,18 @@ namespace // private
}
- const NSString* PBTYPE_SODX = @"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"";
- const NSString* PBTYPE_SESX = @"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
- const NSString* PBTYPE_SLSDX = @"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"";
- const NSString* PBTYPE_ESX = @"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
- const NSString* PBTYPE_LSX = @"application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"";
- const NSString* PBTYPE_EOX = @"application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"";
- const NSString* PBTYPE_SVXB = @"application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"";
- const NSString* PBTYPE_GDIMF = @"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
- const NSString* PBTYPE_WMF = @"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
- const NSString* PBTYPE_EMF = @"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
- const NSString* PBTYPE_DUMMY_INTERNAL = @"application/x-openoffice-internal";
+ NSString* PBTYPE_SODX = @"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"";
+ NSString* PBTYPE_SESX = @"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
+ NSString* PBTYPE_SLSDX = @"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"";
+ NSString* PBTYPE_ESX = @"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
+ NSString* PBTYPE_LSX = @"application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"";
+ NSString* PBTYPE_EOX = @"application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"";
+ NSString* PBTYPE_SVXB = @"application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"";
+ NSString* PBTYPE_GDIMF = @"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
+ NSString* PBTYPE_WMF = @"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
+ NSString* PBTYPE_EMF = @"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
+
+ NSString* PBTYPE_DUMMY_INTERNAL = @"application/x-openoffice-internal";
const char* FLAVOR_SODX = "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"";
const char* FLAVOR_SESX = "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
commit d14054415db5bca6d149c2268b175657b7b510c8
Author: Kristian Rietveld <kris at lanedo.com>
Date: Sat Oct 22 09:40:20 2011 +0200
Argument to setTitle cannot be const
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index a29abb7..a781f07 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -222,7 +222,7 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
return retVal;
}
-void ControlHelper::setLabel( sal_Int16 nControlId, const NSString* aLabel )
+void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
@@ -959,7 +959,7 @@ void ControlHelper::createFilterControl() {
DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-NSTextField* ControlHelper::createLabelWithString(const NSString* labelString) {
+NSTextField* ControlHelper::createLabelWithString(NSString* labelString) {
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "label", labelString);
NSTextField *textField = [NSTextField new];
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index 23dd79b..b2e59be 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -68,7 +68,7 @@ public:
uno::Any getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const;
void enableControl( sal_Int16 nControlId, sal_Bool bEnable ) const;
OUString getLabel( sal_Int16 nControlId );
- void setLabel( sal_Int16 nControlId, const NSString* aLabel );
+ void setLabel( sal_Int16 nControlId, NSString* aLabel );
//------------------------------------------------------------------------------------
// other stuff
@@ -185,7 +185,7 @@ private:
void createControls();
void createFilterControl();
void createUserPane();
- NSTextField* createLabelWithString(const NSString* label);
+ NSTextField* createLabelWithString(NSString* label);
int getControlElementName(const Class clazz, const int nControlId) const;
NSControl* getControl( const sal_Int16 nControlId ) const;
More information about the Libreoffice-commits
mailing list