sd/source/ui/dlg/sddlgfact.cxx | 16 +--
sw/source/ui/index/cnttab.cxx | 2
writerperfect/source/common/WPFTEncodingDialog.cxx | 88 ++++++++++-----------
3 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 4fabf093a3f05aed6ae460e6840fb8a884e89828
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 10 09:19:04 2015 +0200
sw: fix gcc-4.7 build
Change-Id: I6223691a25d5bdcf83b60a26e344fa964d995354
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 9648c96..49664e5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3864,7 +3864,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent,
VclBuilderContainer* pB
BrowserMode::AUTO_VSCROLL|
BrowserMode::HIDECURSOR )
, aCellEdit(VclPtr<Edit>::Create(&GetDataWindow(), 0))
- , aCellCheckBox(VclPtr<::svt::CheckBoxControl>::Create(&GetDataWindow()))
+ , aCellCheckBox(VclPtr< ::svt::CheckBoxControl>::Create(&GetDataWindow()))
, nCurrentRow(0)
, bModified(false)
{
commit 26fb0ce19df808f85cf6115e7ae1db8dc446236a
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 10 09:13:28 2015 +0200
sd: fix gcc-4.7 build
Change-Id: Ia368b9760097b6041757a27f228ace587e243683
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index c42060b..b3cba83 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -378,7 +378,7 @@ VclAbstractDialog *
SdAbstractDialogFactory_Impl::CreateBreakDlg(
sal_uLong nSumActionCount,
sal_uLong nObjCount )
{
- return new SdVclAbstractDialog_Impl( VclPtr<::sd::BreakDlg>::Create(
pWindow, pDrView, pShell, nSumActionCount, nObjCount ) );
+ return new SdVclAbstractDialog_Impl( VclPtr< ::sd::BreakDlg>::Create(
pWindow, pDrView, pShell, nSumActionCount, nObjCount ) );
}
AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg(
@@ -386,7 +386,7 @@ AbstractCopyDlg *
SdAbstractDialogFactory_Impl::CreateCopyDlg(
const rtl::Reference<XColorList>
&pColTab,
::sd::View* pView )
{
- return new AbstractCopyDlg_Impl( VclPtr<::sd::CopyDlg>::Create( pWindow,
rInAttrs, pColTab, pView ) );
+ return new AbstractCopyDlg_Impl( VclPtr< ::sd::CopyDlg>::Create( pWindow,
rInAttrs, pColTab, pView ) );
}
AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg(
vcl::Window* pWindow, SdDrawDocument& rDrawDoc )
@@ -436,12 +436,12 @@ AbstractSdInsertPagesObjsDlg *
SdAbstractDialogFactory_Impl::CreateSdInsertPages
AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window*
pParent, const SdrObject* pObj1, const SdrObject* pObj2)
{
- return new AbstractMorphDlg_Impl( VclPtr<::sd::MorphDlg>::Create( pParent,
pObj1, pObj2 ) );
+ return new AbstractMorphDlg_Impl( VclPtr< ::sd::MorphDlg>::Create(
pParent, pObj1, pObj2 ) );
}
SfxAbstractTabDialog *
SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( vcl::Window*
pParent, const SfxItemSet* pAttr, ::sd::View* pView )
{
- return new AbstractBulletDialog_Impl(
VclPtr<::sd::OutlineBulletDlg>::Create( pParent, pAttr, pView ) );
+ return new AbstractBulletDialog_Impl( VclPtr<
::sd::OutlineBulletDlg>::Create( pParent, pAttr, pView ) );
}
SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg(
vcl::Window* pParent, const SfxItemSet* pAttr )
@@ -457,7 +457,7 @@ AbstractSdStartPresDlg *
SdAbstractDialogFactory_Impl::CreateSdStartPresentatio
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog(
vcl::Window* pWindow )
{
- return new SdVclAbstractDialog_Impl( VclPtr<::sd::RemoteDialog>::Create(
pWindow ) );
+ return new SdVclAbstractDialog_Impl( VclPtr< ::sd::RemoteDialog>::Create(
pWindow ) );
}
SfxAbstractTabDialog *
SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell*
pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase&
rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool )
@@ -514,18 +514,18 @@ CreateTabPage
SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc()
VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog(
vcl::Window* pParent,
SdDrawDocument* pDoc, SdPage* pCurrentPage )
{
- return new SdVclAbstractDialog_Impl(
VclPtr<::sd::MasterLayoutDialog>::Create( pParent, pDoc, pCurrentPage ));
+ return new SdVclAbstractDialog_Impl( VclPtr<
::sd::MasterLayoutDialog>::Create( pParent, pDoc, pCurrentPage ));
}
AbstractHeaderFooterDialog*
SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell*
pViewShell,
vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage )
{
- return new AbstractHeaderFooterDialog_Impl(
VclPtr<::sd::HeaderFooterDialog>::Create( pViewShell, pParent, pDoc,
pCurrentPage ));
+ return new AbstractHeaderFooterDialog_Impl( VclPtr<
::sd::HeaderFooterDialog>::Create( pViewShell, pParent, pDoc, pCurrentPage ));
}
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog(
vcl::Window* pWindow, SdDrawDocument* pDoc )
{
- return new SdVclAbstractDialog_Impl(
VclPtr<::sd::SdPhotoAlbumDialog>::Create( pWindow, pDoc ) );
+ return new SdVclAbstractDialog_Impl( VclPtr<
::sd::SdPhotoAlbumDialog>::Create( pWindow, pDoc ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3f50c6ee4b679d7d53a7d7bf648aa7b466039d34
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 10 09:12:12 2015 +0200
writerperfect: fix gcc-4.7 build
error: could not convert '(const char*)"..."' from 'const char*' to
'const rtl::OUString'
Change-Id: Ia8569aed46e571bd98489fd91b9708d0fe5df4c0
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 18b7b04..f174cc0 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -38,50 +38,50 @@ struct EncodingImplementation
OUString const(EncodingImplementation::s_encodings[])=
{
- "MacArabic", "Arabic (Apple Macintosh)",
- "CP864", "Arabic (DOS/OS2-864)",
- "CP1006", "Arabic (IBM-1006)",
- "CP1256", "Arabic (Windows-1256)",
- "CP775", "Baltic (DOS/OS2-775)",
- "CP1257", "Baltic (Windows-1257)",
- "MacCeltic", "Celtic (Apple Macintosh)",
- "MacCyrillic", "Cyrillic (Apple Macintosh)",
- "CP855", "Cyrillic (DOS/OS2-855)",
- "CP866", "Cyrillic (DOS/OS2-866/Russian)",
- "CP1251", "Cyrillic (Windows-1251)",
- "MacCEurope", "Eastern Europe (Apple Macintosh)",
- "MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)",
- "MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)",
- "CP852", "Eastern Europe (DOS/OS2-852)",
- "CP1250", "Eastern Europe (Windows-1250/WinLatin 2)",
- "MacGreek", "Greek (Apple Macintosh)",
- "CP737", "Greek (DOS/OS2-737)",
- "CP869", "Greek (DOS/OS2-869/Greek-2)",
- "CP875", "Greek (DOS/OS2-875)",
- "CP1253", "Greek (Windows-1253)",
- "MacHebrew", "Hebrew (Apple Macintosh)",
- "CP424", "Hebrew (DOS/OS2-424)",
- "CP856", "Hebrew (DOS/OS2-856)",
- "CP862", "Hebrew (DOS/OS2-862)",
- "CP1255", "Hebrew (Windows-1255)",
- "CP500", "International (DOS/OS2-500)",
- "MacThai", "Thai (Apple Macintosh)",
- "CP874", "Thai (DOS/OS2-874)",
- "MacTurkish", "Turkish (Apple Macintosh)",
- "CP857", "Turkish (DOS/OS2-857)",
- "CP1026", "Turkish (DOS/OS2-1026)",
- "CP1254", "Turkish (Windows-1254)",
- "CP1258", "Vietnamese (Windows-1258)",
- "MacRoman", "Western Europe (Apple Macintosh)",
- "MacIceland", "Western Europe (Apple Macintosh/Icelandic)",
- "CP037", "Western Europe (DOS/OS2-037/US-Canada)",
- "CP437", "Western Europe (DOS/OS2-437/US)",
- "CP850", "Western Europe (DOS/OS2-850)",
- "CP860", "Western Europe (DOS/OS2-860/Portuguese)",
- "CP861", "Western Europe (DOS/OS2-861/Icelandic)",
- "CP863", "Western Europe (DOS/OS2-863/French)",
- "CP865", "Western Europe (DOS/OS2-865/Nordic)",
- "CP1252", "Western Europe (Windows-1252/WinLatin 1)"
+ OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"),
+ OUString("CP864"), OUString("Arabic (DOS/OS2-864)"),
+ OUString("CP1006"), OUString("Arabic (IBM-1006)"),
+ OUString("CP1256"), OUString("Arabic (Windows-1256)"),
+ OUString("CP775"), OUString("Baltic (DOS/OS2-775)"),
+ OUString("CP1257"), OUString("Baltic (Windows-1257)"),
+ OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"),
+ OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"),
+ OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"),
+ OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"),
+ OUString("CP1251"), OUString("Cyrillic (Windows-1251)"),
+ OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"),
+ OUString("MacCroatian"), OUString("Eastern Europe (Apple
Macintosh/Croatian)"),
+ OUString("MacRomanian"), OUString("Eastern Europe (Apple
Macintosh/Romanian)"),
+ OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"),
+ OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"),
+ OUString("MacGreek"), OUString("Greek (Apple Macintosh)"),
+ OUString("CP737"), OUString("Greek (DOS/OS2-737)"),
+ OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"),
+ OUString("CP875"), OUString("Greek (DOS/OS2-875)"),
+ OUString("CP1253"), OUString("Greek (Windows-1253)"),
+ OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"),
+ OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"),
+ OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"),
+ OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"),
+ OUString("CP1255"), OUString("Hebrew (Windows-1255)"),
+ OUString("CP500"), OUString("International (DOS/OS2-500)"),
+ OUString("MacThai"), OUString("Thai (Apple Macintosh)"),
+ OUString("CP874"), OUString("Thai (DOS/OS2-874)"),
+ OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"),
+ OUString("CP857"), OUString("Turkish (DOS/OS2-857)"),
+ OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"),
+ OUString("CP1254"), OUString("Turkish (Windows-1254)"),
+ OUString("CP1258"), OUString("Vietnamese (Windows-1258)"),
+ OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"),
+ OUString("MacIceland"), OUString("Western Europe (Apple
Macintosh/Icelandic)"),
+ OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"),
+ OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"),
+ OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"),
+ OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"),
+ OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"),
+ OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"),
+ OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"),
+ OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)")
};
inline int EncodingImplementation::numEncodings()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
