[Libreoffice-commits] .: sd/source
sd/source/filter/html/htmlex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c5285699162ad2888c7df015cdf035ab5bf00379
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 16 13:03:04 2012 +0200
C++ overloading is clearly the best invention ever
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 6b58bab..57df9d4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2050,7 +2050,7 @@ bool HtmlExport::CreateOutlinePages()
}
// Seite 0 wird der zugeklappte Outline, Seite 1 der aufgeklappte
-for( int nPage = 0; nPage (mbImpress?2:1) bOk; nPage++ )
+for (sal_Int32 nPage = 0; nPage (mbImpress?2:1) bOk; ++nPage)
{
// Html Kopf
String aStr(maHTMLHeader);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/filter/html/htmlex.cxx |3 -
sd/source/filter/sdfilter.cxx|2
sd/source/filter/sdpptwrp.cxx| 18
sd/source/filter/xml/sdtransform.cxx |6 +-
sd/source/filter/xml/sdxmlwrp.cxx| 78 +++
5 files changed, 48 insertions(+), 59 deletions(-)
New commits:
commit fe794eaa03c198320e525725ec1fe51210df9775
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Mon Apr 16 09:59:48 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
sd/filter
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 57df9d4..cc4573a 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3133,8 +3133,7 @@ bool HtmlExport::checkForExistingFiles()
try
{
Reference XMultiServiceFactory xMsf(
::comphelper::getProcessServiceFactory() );
-Reference ::com::sun::star::ucb::XSimpleFileAccess xFA(
xMsf-createInstance(
-
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccess))),
UNO_QUERY_THROW );
+Reference ::com::sun::star::ucb::XSimpleFileAccess xFA(
xMsf-createInstance( com.sun.star.ucb.SimpleFileAccess ), UNO_QUERY_THROW );
sal_uInt16 nSdPage;
for( nSdPage = 0; !bFound (nSdPage mnSdPageCount); nSdPage++)
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 0016933..ec24592 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -76,7 +76,7 @@ SdFilter::~SdFilter()
::rtl::OUString SdFilter::ImplGetFullLibraryName( const ::rtl::OUString
rLibraryName ) const
{
-String aTemp(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY(?;
+String aTemp(::rtl::OUString(SVLIBRARY(?)));
xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' );
aTemp.Replace( nIndex, 1, rLibraryName );
::rtl::OUString aLibraryName( aTemp );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 2229c26..052cf61 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -92,25 +92,25 @@ sal_Bool SdPPTFilter::Import()
xDualStorage = pStorage-OpenSotStorage( sDualStorage,
STREAM_STD_READ );
pStorage = xDualStorage;
}
-SvStream* pDocStream = pStorage-OpenSotStream( String(
RTL_CONSTASCII_USTRINGPARAM(PowerPoint Document) ), STREAM_STD_READ );
+SvStream* pDocStream = pStorage-OpenSotStream(
rtl::OUString(PowerPoint Document) , STREAM_STD_READ );
if( pDocStream )
{
pDocStream-SetVersion( pStorage-GetVersion() );
pDocStream-SetCryptMaskKey(pStorage-GetKey());
-if ( pStorage-IsStream( String(
RTL_CONSTASCII_USTRINGPARAM(EncryptedSummary) ) ) )
-mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT,
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+if ( pStorage-IsStream( rtl::OUString(EncryptedSummary ) ) )
+mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT,
OSL_LOG_PREFIX );
else
{
::osl::Module* pLibrary = OpenLibrary(
mrMedium.GetFilter()-GetUserData() );
if ( pLibrary )
{
-ImportPPT PPTImport = reinterpret_cast ImportPPT (
pLibrary-getFunctionSymbol( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ImportPPT ) ) ) );
+ImportPPT PPTImport = reinterpret_cast ImportPPT (
pLibrary-getFunctionSymbol( ImportPPT ) );
if ( PPTImport )
bRet = PPTImport( mrDocument, *pDocStream, *pStorage,
mrMedium );
if ( !bRet )
-mrMedium.SetError( SVSTREAM_WRONGVERSION,
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+mrMedium.SetError( SVSTREAM_WRONGVERSION,
OSL_LOG_PREFIX );
}
}
@@ -133,7 +133,7 @@ sal_Bool SdPPTFilter::Export()
if( mxModel.is() )
{
SotStorageRefxStorRef = new SotStorage(
mrMedium.GetOutStream(), sal_False );
-ExportPPT PPTExport =
reinterpret_castExportPPT(pLibrary-getFunctionSymbol(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ExportPPT)) ));
+ExportPPT PPTExport =
reinterpret_castExportPPT(pLibrary-getFunctionSymbol( ExportPPT ));
if( PPTExport xStorRef.Is() )
{
@@ -155,10 +155,10 @@ sal_Bool SdPPTFilter::Export()
if( mbShowProgress )
CreateStatusIndicator();
-rtl::OUString sBaseURI( RTL_CONSTASCII_USTRINGPARAM(BaseURI)
);
+//rtl::OUString sBaseURI( BaseURI);
std::vector PropertyValue aProperties;
PropertyValue aProperty;
-aProperty.Name = sBaseURI;
+aProperty.Name = BaseURI;
[Libreoffice-commits] .: sd/source
sd/source/ui/presenter/PresenterCanvasFactory.cxx |2 +-
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx|2 +-
sd/source/ui/toolpanel/LayoutMenu.cxx |2 +-
sd/source/ui/toolpanel/ScrollPanel.cxx |2 +-
sd/source/ui/toolpanel/SubToolPanel.cxx|2 +-
sd/source/ui/toolpanel/ToolPanelViewShell.cxx |2 +-
sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx |2 +-
sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx |2 +-
sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx |2 +-
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx|8
sd/source/ui/unoidl/sddetect.cxx |5 ++---
sd/source/ui/view/GraphicObjectBar.cxx |2 +-
sd/source/ui/view/drtxtob.cxx |2 +-
sd/source/ui/view/drviewsf.cxx |2 +-
sd/source/ui/view/outlnvsh.cxx |5 ++---
sd/source/ui/view/outlview.cxx |2 +-
16 files changed, 21 insertions(+), 23 deletions(-)
New commits:
commit 9432c51b350958162df7fa6cddb4aaf0536735df
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Apr 13 22:22:39 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx
b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
index 2253055..1999f12 100644
--- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx
+++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
@@ -251,7 +251,7 @@ Referencerendering::XCanvas
PresenterCanvasFactory::CreateCanvas (
xFactory-createInstanceWithArguments(
rsCanvasServiceName.getLength()0
? rsCanvasServiceName
-:
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.rendering.VCLCanvas)),
+: OUString(com.sun.star.rendering.VCLCanvas),
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index e8421a5..a9b09a9 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -140,7 +140,7 @@ SlideSorterViewShell::SlideSorterViewShell (
mpFrameView = new FrameView(GetDoc());
GetFrameView()-Connect();
-SetName (String (RTL_CONSTASCII_USTRINGPARAM(SlideSorterViewShell)));
+SetName (rtl::OUString(SlideSorterViewShell));
pParentWindow-SetStyle(pParentWindow-GetStyle() | WB_DIALOGCONTROL);
}
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx
b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 70af4cd..62d2c50 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -206,7 +206,7 @@ void LayoutMenu::implConstruct( DrawDocShell
rDocumentShell )
SetExtraSpacing(2);
SetSelectHdl (LINK(this, LayoutMenu, ClickHandler));
SetPool (rDocumentShell.GetDoc()-GetPool());
-SetName(String(RTL_CONSTASCII_USTRINGPARAM(LayoutMenu)));
+SetName(rtl::OUString(LayoutMenu));
InvalidateContent();
Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx
b/sd/source/ui/toolpanel/ScrollPanel.cxx
index ee575ce..b201124 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -60,7 +60,7 @@ ScrollPanel::ScrollPanel (
void ScrollPanel::Construct()
{
-SetAccessibleName (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Sub Task
Panel)));
+SetAccessibleName (::rtl::OUString(Sub Task Panel));
mpControlContainer-SetMultiSelection (true);
SetBorderStyle (WINDOW_BORDER_NORMAL);
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx
b/sd/source/ui/toolpanel/SubToolPanel.cxx
index e753918..1d1c8db 100644
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -52,7 +52,7 @@ SubToolPanel::SubToolPanel (
mnVerticalGap(3),
mnHorizontalBorder(2)
{
-SetAccessibleName (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Sub Task
Panel)));
+SetAccessibleName (::rtl::OUString(Sub Task Panel));
mpControlContainer-SetMultiSelection (true);
SetBorderStyle (WINDOW_BORDER_NORMAL);
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 66fe8f6..12f6515 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -512,7 +512,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame*
pFrame, ViewShellBase rVi
mpHorizontalRuler.reset();
mpVerticalRuler.reset();
-SetName( String( RTL_CONSTASCII_USTRINGPARAM(
[Libreoffice-commits] .: sd/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ab05fbd16e3613494731414276f63b5a03e164e9 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 12 15:11:38 2012 +0100 fix build diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index dcdad2b..9d37e45 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -847,7 +847,7 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet) pFirstPage = pPage; aPageStr += ; -aPageStr += rtl::OUString::valueOf( nFirstPage + 1 ); +aPageStr += rtl::OUString::valueOf( static_castsal_Int32(nFirstPage + 1) ); aPageStr += / ; aPageStr += rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/unoidl/DrawController.cxx | 36 +++-
sd/source/ui/unoidl/SdUnoDrawView.cxx |4
sd/source/ui/unoidl/SdUnoOutlineView.cxx|4
sd/source/ui/unoidl/SdUnoSlideView.cxx |9 --
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 13 +--
sd/source/ui/unoidl/randomnode.cxx |5 -
sd/source/ui/unoidl/sddetect.cxx| 18 ++--
sd/source/ui/unoidl/unocpres.cxx|8 -
sd/source/ui/unoidl/unodoc.cxx | 12 +-
sd/source/ui/unoidl/unolayer.cxx| 10 +-
sd/source/ui/unoidl/unomodel.cxx| 114 ++--
sd/source/ui/unoidl/unomodule.cxx |4
sd/source/ui/unoidl/unoobj.cxx | 36
sd/source/ui/unoidl/unopage.cxx | 52 ++--
sd/source/ui/unoidl/unopback.cxx|4
15 files changed, 161 insertions(+), 168 deletions(-)
New commits:
commit 0c1151a49adcc4b10840b3196437090e6f90331a
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Sun Apr 8 14:52:30 2012 -0300
More RT_CONSTASCII_USTRINGPARAM removals
This time with sd/.../ui/unoidl
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index b68628f..6e48581 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -237,19 +237,18 @@ OUString SAL_CALL DrawController::getImplementationName(
) throw(RuntimeExcepti
// Do not throw an excepetion at the moment. This leads to a crash
// under Solaris on relead. See issue i70929 for details.
//ThrowIfDisposed();
-return OUString( RTL_CONSTASCII_USTRINGPARAM( DrawController ) );
+return OUString(DrawController) ;
}
-static OUString ssServiceName (RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.drawing.DrawingDocumentDrawView));
+static OUString ssServiceName( com.sun.star.drawing.DrawingDocumentDrawView);
sal_Bool SAL_CALL DrawController::supportsService (
const OUString rsServiceName)
throw(RuntimeException)
{
-// Do not throw an excepetion at the moment. This leads to a crash
+// Do not throw an exception at the moment. This leads to a crash
// under Solaris on relead. See issue i70929 for details.
//ThrowIfDisposed();
return rsServiceName.equals(ssServiceName);
@@ -525,8 +524,7 @@ void DrawController::FireSwitchCurrentPage (SdPage*
pNewCurrentPage) throw()
catch (const uno::Exception)
{
OSL_FAIL(
-(::rtl::OString(sd::SdUnoDrawView::FireSwitchCurrentPage(),
-exception caught: ) +
+(sd::SdUnoDrawView::FireSwitchCurrentPage(), exception
caught: +
::rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
@@ -640,55 +638,54 @@ void DrawController::FillPropertyTable (
::std::vectorbeans::Property rProperties)
{
rProperties.push_back(
-beans::Property(
-OUString( RTL_CONSTASCII_USTRINGPARAM(VisibleArea) ),
+beans::Property(VisibleArea,
PROPERTY_WORKAREA,
::getCppuType((const ::com::sun::star::awt::Rectangle*)0),
beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::READONLY));
rProperties.push_back(
beans::Property(
-OUString( RTL_CONSTASCII_USTRINGPARAM(SubController) ),
+SubController,
PROPERTY_SUB_CONTROLLER,
::getCppuType((const Referencedrawing::XDrawSubController*)0),
beans::PropertyAttribute::BOUND));
rProperties.push_back(
beans::Property(
-OUString( RTL_CONSTASCII_USTRINGPARAM(CurrentPage) ),
+CurrentPage,
PROPERTY_CURRENTPAGE,
::getCppuType((const Reference drawing::XDrawPage *)0),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
-beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM(IsLayerMode)
),
+beans::Property(IsLayerMode,
PROPERTY_LAYERMODE,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
-beans::Property( OUString(
RTL_CONSTASCII_USTRINGPARAM(IsMasterPageMode) ),
+beans::Property(IsMasterPageMode,
PROPERTY_MASTERPAGEMODE,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
-beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM(ActiveLayer)
),
+beans::Property(ActiveLayer,
PROPERTY_ACTIVE_LAYER,
::getCppuBooleanType(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
-beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM(ZoomValue) ),
+beans::Property(ZoomValue,
PROPERTY_ZOOMVALUE,
[Libreoffice-commits] .: sd/source
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 34 ++
sd/source/ui/view/drviewsa.cxx| 20
sd/source/ui/view/frmview.cxx |6 +-
sd/source/ui/view/viewshel.cxx|2
4 files changed, 29 insertions(+), 33 deletions(-)
New commits:
commit 85bdc19fcb6a1a71d6aef0f00b8610f4b85e5a00
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Sat Apr 7 13:41:56 2012 -0300
More stuffs related to OUStrings in sd
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 9231f42..b025ced 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star::accessibility;
class SfxViewFrame;
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
namespace accessibility {
@@ -399,31 +397,30 @@ void SAL_CALL
OUString sFirstService = aServices[0];
if ( sFirstService == com.sun.star.drawing.DrawingDocumentDrawView )
{
-if( aServices.getLength() = 2
-
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.presentation.PresentationView)))
+if( aServices.getLength() = 2 aServices[1] ==
com.sun.star.presentation.PresentationView)
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
+sName = ResId::toString(SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
}
else
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
else if ( sFirstService == com.sun.star.presentation.NotesView )
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
else if ( sFirstService == com.sun.star.presentation.HandoutView )
{
SolarMutexGuard aGuard;
-sName = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
+sName = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
}
else
{
@@ -432,7 +429,7 @@ void SAL_CALL
}
else
{
-sName =
OUString(RTL_CONSTASCII_USTRINGPARAM(AccessibleDrawDocumentView));
+sName = AccessibleDrawDocumentView;
}
return sName;
}
@@ -456,31 +453,30 @@ void SAL_CALL
OUString sFirstService = aServices[0];
if ( sFirstService == com.sun.star.drawing.DrawingDocumentDrawView )
{
-if( aServices.getLength() = 2
-
aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.presentation.PresentationView)))
+if( aServices.getLength() = 2 aServices[1] ==
com.sun.star.presentation.PresentationView)
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
}
else
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
else if ( sFirstService == com.sun.star.presentation.NotesView )
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
+sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_D)
);
}
else if ( sFirstService == com.sun.star.presentation.HandoutView )
{
SolarMutexGuard aGuard;
-sDescription = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
+sDescription = ResId::toString(
SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
}
else
{
@@ -489,7 +485,7 @@ void SAL_CALL
}
else
{
-sDescription = OUString(RTL_CONSTASCII_USTRINGPARAM(Accessible Draw
Document));
+sDescription = Accessible Draw Document;
}
return sDescription;
}
@@ -694,7 +690,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing (void)
void AccessibleDrawDocumentView::UpdateAccessibleName (void)
{
OUString sNewName (CreateAccessibleName());
-sNewName += A2S(: );
+sNewName += : ;
// Add the number of the current slide.
uno::Referencedrawing::XDrawView xView (mxController, uno::UNO_QUERY);
@@ -705,7 +701,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
[Libreoffice-commits] .: sd/source
sd/source/ui/view/Outliner.cxx |3 -
sd/source/ui/view/PresentationViewShellBase.cxx |8 +
sd/source/ui/view/ToolBarManager.cxx| 38 ++--
sd/source/ui/view/ViewShellBase.cxx |8 +
sd/source/ui/view/drviews7.cxx |3 -
sd/source/ui/view/drviewsa.cxx |5 +--
sd/source/ui/view/drviewsb.cxx |2 -
sd/source/ui/view/drviewse.cxx | 20 ++--
8 files changed, 37 insertions(+), 50 deletions(-)
New commits:
commit 7d82fb18fe6ae68f6eb6a33c6030105f9e2fe232
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Apr 6 08:27:05 2012 -0300
Review of some RTL_CONSTASCII_USTRINGPARAM removal
Remove OUString constructor where not needed.
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d9858b1..e7100e7 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -211,8 +211,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
const SvtLinguConfigaLinguConfig;
Any aAny;
-aAny = aLinguConfig.GetProperty(
-rtl::OUString( UPN_IS_SPELL_AUTO ) );
+aAny = aLinguConfig.GetProperty( UPN_IS_SPELL_AUTO );
aAny = bOnlineSpell;
}
catch( ... )
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx
b/sd/source/ui/view/PresentationViewShellBase.cxx
index 8c7315f..bd43160 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -85,14 +85,10 @@ PresentationViewShellBase::PresentationViewShellBase (
UNO_QUERY);
if (xFrameSet.is())
{
-Referencebeans::XPropertySet xLayouterSet (
-xFrameSet-getPropertyValue(::rtl::OUString(LayoutManager)),
-UNO_QUERY);
+Referencebeans::XPropertySet
xLayouterSet(xFrameSet-getPropertyValue(LayoutManager), UNO_QUERY);
if (xLayouterSet.is())
{
-xLayouterSet-setPropertyValue(
-::rtl::OUString(AutomaticToolbars),
-makeAny(sal_False));
+xLayouterSet-setPropertyValue(AutomaticToolbars,
makeAny(sal_False));
}
}
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index 4d1ef89..7b89cf5 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -58,9 +58,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#undef OUSTRING // Remove definition made in the SFX
-#define OUSTRING(s) (::rtl::OUString(s))
-
namespace {
using namespace sd;
@@ -359,21 +356,21 @@ private:
//= ToolBarManager
-const ::rtl::OUString ToolBarManager::msToolBar(OUSTRING(toolbar));
-const ::rtl::OUString ToolBarManager::msOptionsToolBar(OUSTRING(optionsbar));
-const ::rtl::OUString
ToolBarManager::msCommonTaskToolBar(OUSTRING(commontaskbar));
-const ::rtl::OUString ToolBarManager::msViewerToolBar(OUSTRING(viewerbar));
-const ::rtl::OUString
ToolBarManager::msSlideSorterToolBar(OUSTRING(slideviewtoolbar));
-const ::rtl::OUString
ToolBarManager::msSlideSorterObjectBar(OUSTRING(slideviewobjectbar));
-const ::rtl::OUString
ToolBarManager::msOutlineToolBar(OUSTRING(outlinetoolbar));
-const ::rtl::OUString
ToolBarManager::msMasterViewToolBar(OUSTRING(masterviewtoolbar));
-const ::rtl::OUString
ToolBarManager::msDrawingObjectToolBar(OUSTRING(drawingobjectbar));
-const ::rtl::OUString
ToolBarManager::msGluePointsToolBar(OUSTRING(gluepointsobjectbar));
-const ::rtl::OUString
ToolBarManager::msTextObjectBar(OUSTRING(textobjectbar));
-const ::rtl::OUString
ToolBarManager::msBezierObjectBar(OUSTRING(bezierobjectbar));
-const ::rtl::OUString
ToolBarManager::msGraphicObjectBar(OUSTRING(graphicobjectbar));
-const ::rtl::OUString
ToolBarManager::msMediaObjectBar(OUSTRING(mediaobjectbar));
-const ::rtl::OUString
ToolBarManager::msTableObjectBar(OUSTRING(tableobjectbar));
+const ::rtl::OUString ToolBarManager::msToolBar(toolbar);
+const ::rtl::OUString ToolBarManager::msOptionsToolBar(optionsbar);
+const ::rtl::OUString ToolBarManager::msCommonTaskToolBar(commontaskbar);
+const ::rtl::OUString ToolBarManager::msViewerToolBar(viewerbar);
+const ::rtl::OUString ToolBarManager::msSlideSorterToolBar(slideviewtoolbar);
+const ::rtl::OUString
ToolBarManager::msSlideSorterObjectBar(slideviewobjectbar);
+const ::rtl::OUString ToolBarManager::msOutlineToolBar(outlinetoolbar);
+const ::rtl::OUString ToolBarManager::msMasterViewToolBar(masterviewtoolbar);
+const ::rtl::OUString
ToolBarManager::msDrawingObjectToolBar(drawingobjectbar);
+const ::rtl::OUString
ToolBarManager::msGluePointsToolBar(gluepointsobjectbar);
+const ::rtl::OUString
[Libreoffice-commits] .: sd/source
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
| 29 ++
sd/source/ui/framework/configuration/Configuration.cxx
| 18 +--
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
| 24 +
sd/source/ui/framework/configuration/ConfigurationController.cxx
| 32 +-
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
| 47 +++---
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
| 43 ++---
sd/source/ui/framework/module/ModuleController.cxx
| 15 ---
sd/source/ui/tools/TimerBasedTaskExecution.cxx
| 15 ---
sd/source/ui/view/ToolBarManager.cxx
|8 -
9 files changed, 72 insertions(+), 159 deletions(-)
New commits:
commit 45413e32fe643bda1cc1647c8af7eae3309e9c7d
Author: Rob Snelders programm...@ertai.nl
Date: Wed Apr 4 19:57:05 2012 +0200
Removal VERBOSE
diff --git
a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 92982b7..cbefb08 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -42,18 +42,15 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-#undef VERBOSE
-//#define VERBOSE 1
-
namespace {
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL 0
void TraceRequest (const ReferenceXConfigurationChangeRequest rxRequest)
{
Referencecontainer::XNamed xNamed (rxRequest, UNO_QUERY);
if (xNamed.is())
-OSL_TRACE(%s\n,
+SAL_INFO(sd.fwk, OSL_THIS_FUNC :
::rtl::OUStringToOString(xNamed-getName(),
RTL_TEXTENCODING_UTF8).getStr());
}
@@ -105,14 +102,14 @@ void ChangeRequestQueueProcessor::AddRequest (
{
::osl::MutexGuard aGuard (maMutex);
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL = 2
if (maQueue.empty())
{
-OSL_TRACE(Adding requests to empty queue);
+SAL_INFO(sd.fwk, OSL_THIS_FUNC : Adding requests to empty
queue);
ConfigurationTracer::TraceConfiguration(
mxConfiguration, current configuration of queue processor);
}
-OSL_TRACE(Adding request);
+SAL_INFO(sd.fwk, OSL_THIS_FUNC : Adding request);
TraceRequest(rxRequest);
#endif
@@ -131,9 +128,7 @@ void ChangeRequestQueueProcessor::StartProcessing (void)
mxConfiguration.is()
! maQueue.empty())
{
-#ifdef VERBOSE
-OSL_TRACE(ChangeRequestQueueProcessor scheduling processing);
-#endif
+SAL_INFO(sd.fwk, OSL_THIS_FUNC : ChangeRequestQueueProcessor
scheduling processing);
mnUserEventId = Application::PostUserEvent(
LINK(this,ChangeRequestQueueProcessor,ProcessEvent));
}
@@ -168,9 +163,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
{
::osl::MutexGuard aGuard (maMutex);
-#ifdef VERBOSE
-OSL_TRACE(ProcessOneEvent);
-#endif
+SAL_INFO(sd.fwk, OSL_THIS_FUNC : ProcessOneEvent);
if (mxConfiguration.is()
! maQueue.empty())
@@ -182,7 +175,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
// Execute the change request.
if (xRequest.is())
{
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL = 2
TraceRequest(xRequest);
#endif
xRequest-execute(mxConfiguration);
@@ -190,14 +183,12 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
if (maQueue.empty())
{
-#ifdef VERBOSE
-OSL_TRACE(All requests are processed);
-#endif
+SAL_INFO(sd.fwk, OSL_THIS_FUNC : All requests are
processed);
// The queue is empty so tell the ConfigurationManager to update
// its state.
if (mpConfigurationUpdater.get() != NULL)
{
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL = 2
ConfigurationTracer::TraceConfiguration (
mxConfiguration, updating to configuration);
#endif
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx
b/sd/source/ui/framework/configuration/Configuration.cxx
index 16b25eb..0e01cc9 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -40,8 +40,6 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
using ::rtl::OUString;
-#undef VERBOSE
-
namespace {
/** Use the XResourceId::compareTo() method to implement a compare operator
for STL containers.
@@ -163,11 +161,9 @@ void SAL_CALL Configuration::addResource (const
ReferenceXResourceId rxResour
if (mpResourceContainer-find(rxResourceId) == mpResourceContainer-end())
{
-#ifdef VERBOSE
-
[Libreoffice-commits] .: sd/source
sd/source/ui/view/DocumentRenderer.cxx | 110 -
1 file changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 8981d1d06f2f6225b70d2e51ba0b994a2469037e
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Thu Apr 5 18:19:31 2012 -0300
Cleanup of some RTL_CONSTASCII_USTRINGPARAM macro in sd
Cleanup of some RTL_CONSTASCII_USTRINGPARAM macro in module sd
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index af8f45f..d0b4249 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -412,14 +412,14 @@ namespace {
aOpt.GetModuleName( mbImpress ?
SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt(
aAppGroupname,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
.HelpID:vcl:PrintDialog:TabPage:AppPage ) )
+rtl::OUString(
.HelpID:vcl:PrintDialog:TabPage:AppPage )
) );
uno::Sequence rtl::OUString aHelpIds;
if( mbImpress )
{
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
-aPrintOpt.maGroupHint = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( JobPage ) );
+aPrintOpt.maGroupHint = rtl::OUString( JobPage );
AddDialogControl(
vcl::PrinterOptionsHelper::getSubgroupControlOpt(
String(
SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ),
rtl::OUString(),
@@ -427,42 +427,42 @@ namespace {
);
aHelpIds.realloc( 1 );
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
.HelpID:vcl:PrintDialog:PageContentType:ListBox ) );
+aHelpIds[0] = rtl::OUString(
.HelpID:vcl:PrintDialog:PageContentType:ListBox );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_CONTENT ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
PageContentType ) ),
+OUString( PageContentType ),
CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
0,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
List ) )
+OUString( List )
)
);
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
.HelpID:vcl:PrintDialog:SlidesPerPage:ListBox ) );
+aHelpIds[0] = rtl::OUString(
.HelpID:vcl:PrintDialog:SlidesPerPage:ListBox );
vcl::PrinterOptionsHelper::UIControlOptions
-aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM(
PageContentType ) ), 1 );
+aContentOpt( OUString( PageContentType ), 1 );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
SlidesPerPage ) ),
+OUString( SlidesPerPage ),
GetSlidesPerPageSequence(),
0,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
List ) ),
+OUString( List ),
Sequence sal_Bool (),
aContentOpt
)
);
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
.HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox ) );
+aHelpIds[0] = rtl::OUString(
.HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox );
vcl::PrinterOptionsHelper::UIControlOptions
-aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM(
SlidesPerPage ) ), -1, sal_True );
+aSlidesPerPageOpt( OUString( SlidesPerPage ), -1,
sal_True );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_ORDER ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
SlidesPerPageOrder ) ),
+OUString( SlidesPerPageOrder ),
[Libreoffice-commits] .: sd/source
sd/source/ui/view/outlview.cxx |2 +-
sd/source/ui/view/sdview3.cxx | 10 +-
sd/source/ui/view/sdview4.cxx |2 +-
sd/source/ui/view/viewshe2.cxx |7 +++
4 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit fe51974e6515f48a6e6881e5837027d08c8d66e9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Thu Apr 5 19:34:00 2012 -0300
More removal of RTL_CONSTASCII_USTRINGPARAM in sd
More removal of RTL_CONSTASCII_USTRINGPARAM in module sd
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 67b802d..062cf34 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -174,7 +174,7 @@ OutlineView::OutlineView( DrawDocShell rDocSh, ::Window*
pWindow, OutlineViewSh
ReferenceXFrame xFrame
(mrOutlineViewShell.GetViewShellBase().GetFrame()-GetTopFrame().GetFrameInterface(),
UNO_QUERY);
-const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( .uno:ShowSlide ));
+const OUString aSlotURL( .uno:ShowSlide );
maSlideImage = GetImage( xFrame, aSlotURL, true );
// Tell undo manager of the document about the undo manager of the
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 70f2a7a..339e808 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -975,12 +975,12 @@ sal_Bool View::InsertData( const TransferableDataHelper
rDataHelper,
svt::EmbeddedObjectRef::TryRunningState( xObj );
uno::Reference beans::XPropertySet xProps(
xObj-getComponent(), uno::UNO_QUERY );
if ( xProps.is()
- ( xProps-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( DisableDataTableDialog ) ) ) =
bDisableDataTableDialog )
+ ( xProps-getPropertyValue( ::rtl::OUString(
DisableDataTableDialog ) ) = bDisableDataTableDialog )
bDisableDataTableDialog )
{
-xProps-setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( DisableDataTableDialog ) ),
+xProps-setPropertyValue( ::rtl::OUString(
DisableDataTableDialog ),
uno::makeAny( sal_False ) );
-xProps-setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( DisableComplexChartTypes ) ),
+xProps-setPropertyValue( ::rtl::OUString(
DisableComplexChartTypes ),
uno::makeAny( sal_False ) );
uno::Reference util::XModifiable xModifiable(
xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
@@ -1023,12 +1023,12 @@ sal_Bool View::InsertData( const
TransferableDataHelper rDataHelper,
uno::Reference embed::XStorage xTmpStor =
::comphelper::OStorageHelper::GetTemporaryStorage();
uno::Reference embed::XEmbedObjectClipboardCreator
xClipboardCreator(
::comphelper::getProcessServiceFactory()-createInstance(
- ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.embed.MSOLEObjectSystemCreator)) ),
+ ::rtl::OUString(
com.sun.star.embed.MSOLEObjectSystemCreator) ),
uno::UNO_QUERY_THROW );
embed::InsertedObjectInfo aInfo =
xClipboardCreator-createInstanceInitFromClipboard(
xTmpStor,
-
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( DummyName ) ),
+
::rtl::OUString( DummyName ),
uno::Sequence
beans::PropertyValue () );
// TODO/LATER: in future InsertedObjectInfo will be
used to get container related information
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index e109d8b..bd919e5 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -488,7 +488,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
//TODO/MBA: testing
::rtl::OUString aName;
uno::Sequence beans::PropertyValue aMedium(1);
-aMedium[0].Name = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( URL ) );
+aMedium[0].Name = ::rtl::OUString( URL );
aMedium[0].Value = ::rtl::OUString( aCurrentDropFile
);
uno::Reference embed::XEmbeddedObject xObj =
mpDocSh-GetEmbeddedObjectContainer().
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 7dfdb9b..87c6839 100644
---
[Libreoffice-commits] .: sd/source
sd/source/filter/eppt/eppt.cxx | 10 --
sd/source/filter/eppt/eppt.hxx |2 +-
sd/source/filter/eppt/epptso.cxx |2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit b89bf99ff2c8008951d72d58747793790b13299d
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sat Mar 24 18:08:59 2012 -0430
Replace List with std:vectorEPPTHyperlink.
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 1f7606f..f3c79df 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -465,8 +465,6 @@ PPTWriter::~PPTWriter()
while( aStyleSheetIter maStyleSheetList.end() )
delete *aStyleSheetIter++;
-for ( pPtr = maHyperlink.First(); pPtr; pPtr = maHyperlink.Next() )
-delete (EPPTHyperlink*)pPtr;
for ( pPtr = maExOleObj.First(); pPtr; pPtr = maExOleObj.Next() )
delete (PPTExOleObjEntry*)pPtr;
@@ -962,7 +960,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream
rStrm )
rStrm (sal_uInt32)0; // property size
rStrm (sal_uInt32)0; // property count
-for ( EPPTHyperlink* pLink = (EPPTHyperlink*)maHyperlink.First(); pLink;
pLink = (EPPTHyperlink*)maHyperlink.Next() )
+for ( std::vectorEPPTHyperlink::const_iterator pIter =
maHyperlink.begin(); pIter != maHyperlink.end(); ++pIter )
{
nParaCount += 6;
rStrm(sal_uInt32)3// Type VT_I4
@@ -986,15 +984,15 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream
rStrm )
// = 7 : (PPT) text range
// = 8 : (Project) task
-sal_uInt32 nUrlLen = pLink-aURL.Len();
-const sal_Unicode* pUrl = pLink-aURL.GetBuffer();
+sal_uInt32 nUrlLen = pIter-aURL.Len();
+const sal_Unicode* pUrl = pIter-aURL.GetBuffer();
sal_uInt32 nInfo = 7;
rStrm(sal_uInt32)3// Type VT_I4
nInfo; // Info
-switch( pLink-nType 0xff )
+switch( pIter-nType 0xff )
{
case 1 :// click action to slidenumber
{
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 96f19c4..d8bbc56 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -213,7 +213,7 @@ class PPTWriter : public PPTWriterBase, public
PPTExBulletProvider
sal_uInt32 mnShapeMasterTitle;
sal_uInt32 mnShapeMasterBody;
-ListmaHyperlink;
+std::vectorEPPTHyperlink maHyperlink;
ppt::ExSoundCollection maSoundCollection;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 6841e54..6e8f8ca 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -413,7 +413,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const String
rBookmarkURL, const s
if ( !aRelUrl.isEmpty() )
sBookmarkURL = aRelUrl;
}
-maHyperlink.Insert( new EPPTHyperlink( sBookmarkURL, nType ), LIST_APPEND
);
+maHyperlink.push_back( EPPTHyperlink( sBookmarkURL, nType ) );
*mpExEmbed (sal_uInt16)0xf
(sal_uInt16)EPP_ExHyperlink
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 24b867c1e1d2264ff138d4eafa9791fcd1191160
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 26 13:53:55 2012 +0100
Resolves: rhbz#806663 SlideshowImpl can outlive SdModule (somehow)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3bc8dc1..ed9d76d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference
XPresentation2 xPresentation,
SlideshowImpl::~SlideshowImpl()
{
-SdOptions* pOptions = SD_MOD()-GetSdOptions(DOCUMENT_TYPE_IMPRESS);
+SdModule *pModule = SD_MOD();
+//rhbz#806663 SlideshowImpl can outlive SdModule
+SdOptions* pOptions = pModule ?
+pModule-GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL;
if( pOptions )
{
pOptions-SetPresentationPenColor(mnUserPaintColor);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/inc/sprite.hxx | 91
1 file changed, 91 deletions(-)
New commits:
commit bcf0c0ead1a2459606cd8df90cddd40e944f91de
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sat Mar 24 14:46:57 2012 -0430
Remove unused class.
diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx
deleted file mode 100644
index d67163e..000
--- a/sd/source/ui/inc/sprite.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef SD_SPRITE_HXX
-#define SD_SPRITE_HXX
-
-#include vcl/virdev.hxx
-#include vcl/region.hxx
-#include vcl/mapmod.hxx
-#include vcl/image.hxx
-#include vcl/bitmapex.hxx
-
-// --
-// - Sprite -
-// --
-
-
-namespace sd {
-
-class Marker;
-class MetaFile;
-
-class Sprite
-{
-public:
-Sprite( List* pListOfBmpEx );
-~Sprite();
-
-sal_BoolStartMoving( OutputDevice* pOut,
- OutputDevice* pBottomLayer = NULL,
- BitmapEx* pTopLayer = NULL,
- MetaFile** ppTopMtf = NULL,
- Marker* pObjStartMarker = NULL,
- Marker* pObjEndMarker = NULL );
-voidMoveTo( OutputDevice* pOut, const Point rPt, const Size*
pSz = NULL );
-voidMoveTo( OutputDevice* pOut, const Point rPt, const
double rScaleX, const double rScaleY );
-voidEndMoving( OutputDevice* pOut );
-
-protected:
-MapMode aOldMap;
-Region aOldClip;
-Rectangle aPaintRect;
-Point aPt;
-SizeaSz;
-Point aLayerOffsetPix;
-VirtualDevice* pPaintDev;
-VirtualDevice* pBottomLayer;
-BitmapEx* pActBmpEx;
-BitmapEx* pTopLayer;
-MetaFile** ppTopMtf;
-Marker* pObjStartMarker;
-Marker* pObjEndMarker;
-List* pListOfBmpEx;
-sal_uLong nLastTime;
-sal_BoolbClipRegion;
-
-sal_BoolImplPrepareMoveTo();
-voidImplDrawSprite( OutputDevice* pOut, const Point rPt,
const Size rSz );
-
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/view/MediaObjectBar.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 84665adcea8e80bedad15916a183574344a3d146
Author: Katarina Machalkova bu...@bubli.org
Date: Thu Mar 8 22:05:15 2012 +0100
fdo#32598: Changing media playback options sets modified flag
diff --git a/sd/source/ui/view/MediaObjectBar.cxx
b/sd/source/ui/view/MediaObjectBar.cxx
index 3530a37..4bf22c3 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -154,6 +154,10 @@ void MediaObjectBar::Execute( SfxRequest rReq )
{
static_cast sdr::contact::ViewContactOfSdrMediaObj (
pObj-GetViewContact() ).executeMediaItem(
static_cast const ::avmedia::MediaItem ( *pItem ) );
+
+//fdo #32598: after changing playback opts, set document's
modified flag
+SdDrawDocument rDoc = mpView-GetDoc();
+rDoc.SetChanged(sal_True);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/unoidl/sddetect.cxx | 22 +++---
sd/source/ui/unoidl/unomodel.cxx |4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit c471556c89e4efcd21c0e48f938792c493662492
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 27 01:45:47 2012 +0900
Avoid temporary rtl::OUString in sd
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index dba3e46..87b113d 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -128,42 +128,42 @@ SdFilterDetect::~SdFilterDetect()
for( sal_Int32 nProperty=0; nPropertynPropertyCount; ++nProperty )
{
// extract properties
-if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(URL)) )
+if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL)) )
{
lDescriptor[nProperty].Value = sTemp;
aURL = sTemp;
}
-else if( !aURL.Len() lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(FileName)) )
+else if( !aURL.Len()
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(FileName))
)
{
lDescriptor[nProperty].Value = sTemp;
aURL = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(TypeName)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(TypeName))
)
{
lDescriptor[nProperty].Value = sTemp;
aTypeName = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(FilterName)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(FilterName))
)
{
lDescriptor[nProperty].Value = sTemp;
aPreselectedFilterName = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(InputStream)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(InputStream))
)
nIndexOfInputStream = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(ReadOnly)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ReadOnly))
)
nIndexOfReadOnlyFlag = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(UCBContent)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UCBContent))
)
nIndexOfContent = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(AsTemplate)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AsTemplate))
)
{
lDescriptor[nProperty].Value = bOpenAsTemplate;
nIndexOfTemplateFlag = nProperty;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(InteractionHandler)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(InteractionHandler))
)
lDescriptor[nProperty].Value = xInteraction;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(RepairPackage)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(RepairPackage))
)
lDescriptor[nProperty].Value = bRepairPackage;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(DocumentTitle)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(DocumentTitle))
)
nIndexOfDocumentTitle = nProperty;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a061d4f..9bb08b3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1804,9 +1804,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32
nRenderer, const uno::Any r
for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength();
nProperty nPropertyCount; ++nProperty )
{
-if( rxOptions[ nProperty ].Name == OUString(
RTL_CONSTASCII_USTRINGPARAM( RenderDevice ) ) )
+if( rxOptions[ nProperty
].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(RenderDevice)) )
rxOptions[ nProperty ].Value = xRenderDevice;
-else if ( rxOptions[ nProperty ].Name == OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportNotesPages ) ) )
+else if ( rxOptions[ nProperty
].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ExportNotesPages)) )
{
rxOptions[ nProperty].Value = bExportNotesPages;
if ( bExportNotesPages )
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: sd/source
sd/source/ui/unoidl/unopage.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit fd33c0b1cf23020b27db25895eeb380653d734b6
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Feb 1 18:01:17 2012 +0530
n#735533: Donot set duplicate master slide names.
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4867338..a13a4fa 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any rValue ) throw()
}
// XNamed
-void SAL_CALL SdMasterPage::setName( const OUString aName )
+void SAL_CALL SdMasterPage::setName( const OUString rName )
throw(uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString
aName )
if(SvxFmDrawPage::mpPage GetPage()-GetPageKind() != PK_NOTES)
{
-String aNewName( aName );
+SdDrawDocument* pDoc = GetModel()-GetDoc();
+sal_Bool bOutDummy;
+String aNewName( rName );
+
+// Slide Name has to be unique
+if( pDoc pDoc-GetPageByName( aNewName, bOutDummy ) !=
SDRPAGE_NOTFOUND )
+return; // throw Exception ?
+
GetPage()-SetName( aNewName );
-if(GetModel()-GetDoc())
-
GetModel()-GetDoc()-RenameLayoutTemplate(GetPage()-GetLayoutName(),
aNewName);
+if( pDoc )
+pDoc-RenameLayoutTemplate( GetPage()-GetLayoutName(), aNewName );
// fake a mode change to repaint the page tab bar
::sd::DrawDocShell* pDocSh = GetModel()-GetDocShell();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/sdpreslt.cxx | 43 +++---
sd/source/ui/inc/sdpreslt.hxx |5 ++--
2 files changed, 19 insertions(+), 29 deletions(-)
New commits:
commit e8b7f1faaf3b0fd837a236a4a53d0f7392723713
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 1 12:58:45 2012 +
convert SdPresLayoutDlg from tools/list.hxx to boost::ptr_vector
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 98f2df5..db30dff 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -76,8 +76,6 @@ SdPresLayoutDlg::SdPresLayoutDlg(
{
FreeResource();
-mpLayoutNames = new List;
-
maVS.SetDoubleClickHdl(LINK(this, SdPresLayoutDlg, ClickLayoutHdl));
maBtnLoad.SetClickHdl(LINK(this, SdPresLayoutDlg, ClickLoadHdl));
@@ -92,14 +90,6 @@ SdPresLayoutDlg::SdPresLayoutDlg(
SdPresLayoutDlg::~SdPresLayoutDlg()
{
-String* pName = (String*)mpLayoutNames-First();
-while (pName)
-{
-delete pName;
-pName = (String*)mpLayoutNames-Next();
-}
-
-delete mpLayoutNames;
}
/*
@@ -131,10 +121,10 @@ void SdPresLayoutDlg::Reset()
FillValueSet();
-mnLayoutCount = mpLayoutNames-Count();
+mnLayoutCount = maLayoutNames.size();
for( nName = 0; nName mnLayoutCount; nName++ )
{
-if (*((String*)mpLayoutNames-GetObject(nName)) == maName)
+if (maLayoutNames[nName] == maName)
break;
}
DBG_ASSERT(nName mnLayoutCount, Layout nicht gefunden);
@@ -161,11 +151,11 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet rOutAttrs)
{
aLayoutName = maName;
aLayoutName.Append( DOCUMENT_TOKEN );
-aLayoutName.Append( *(String*)mpLayoutNames-GetObject( nId - 1 ) );
+aLayoutName.Append( maLayoutNames[ nId - 1 ] );
}
else
{
-aLayoutName = *(String*)mpLayoutNames-GetObject( nId - 1 );
+aLayoutName = maLayoutNames[ nId - 1 ];
if( aLayoutName == maStrNone )
aLayoutName.Erase(); // so wird - keine - codiert (s.u.)
}
@@ -202,10 +192,10 @@ void SdPresLayoutDlg::FillValueSet()
{
String aLayoutName(pMaster-GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ) );
-mpLayoutNames-Insert(new String(aLayoutName), LIST_APPEND);
+maLayoutNames.push_back(new String(aLayoutName));
Bitmap aBitmap(mpDocSh-GetPagePreviewBitmap(pMaster, 90));
-maVS.InsertItem((sal_uInt16)mpLayoutNames-Count(), aBitmap,
aLayoutName);
+maVS.InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap,
aLayoutName);
}
}
@@ -274,21 +264,20 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
{
// Pruefen, ob Vorlage schon vorhanden
sal_Bool bExists = sal_False;
-String* pName = (String*)mpLayoutNames-First();
String aCompareStr( maName );
if( maName.Len() == 0 )
aCompareStr = maStrNone;
-while( pName !bExists )
+sal_uInt16 aPos = 0;
+for (boost::ptr_vectorString::iterator it = maLayoutNames.begin();
+ it != maLayoutNames.end() !bExists; ++it, ++aPos)
{
-if( aCompareStr == *pName )
+if( aCompareStr == *it )
{
bExists = sal_True;
// Vorlage selektieren
-sal_uInt16 nId = (sal_uInt16) mpLayoutNames-GetCurPos() + 1;
-maVS.SelectItem( nId );
+maVS.SelectItem( aPos + 1 );
}
-pName = (String*)mpLayoutNames-Next();
}
if( !bExists )
@@ -313,10 +302,10 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
{
String aLayoutName(pMaster-GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii(
SD_LT_SEPARATOR ) );
-mpLayoutNames-Insert(new String(aLayoutName),
LIST_APPEND);
+maLayoutNames.push_back(new String(aLayoutName));
Bitmap
aBitmap(pTemplDocSh-GetPagePreviewBitmap(pMaster, 90));
-
maVS.InsertItem((sal_uInt16)mpLayoutNames-Count(), aBitmap, aLayoutName);
+maVS.InsertItem((sal_uInt16)maLayoutNames.size(),
aBitmap, aLayoutName);
}
}
}
@@ -330,15 +319,15 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
else
{
// leeres Layout
-mpLayoutNames-Insert( new String( maStrNone ), LIST_APPEND );
-maVS.InsertItem( (sal_uInt16) mpLayoutNames-Count(),
+maLayoutNames.push_back( new String( maStrNone ) );
+maVS.InsertItem(
[Libreoffice-commits] .: sd/source
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 799f2de5d1085d845ec498af0a7932965c42ed68
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Jan 22 14:53:11 2012 +0400
fdo#43705: fix incomplete updating of the page preview pane in Draw
This regression was introduced in f215333002882872129066828228d3343a903331.
As stated in PageObjectPainter::PaintPageObject:
The page object layouter is quite volatile.
The rest of usages of mpPageObjectLayouter looks sane, but who knows...
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index c376e45..8a2ae0b 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -167,6 +167,7 @@ void PageObjectPainter::PaintPageObject (
void PageObjectPainter::NotifyResize (const bool bForce)
{
+mpPageObjectLayouter = mrLayouter.GetPageObjectLayouter();
if (bForce || ! mpPageObjectLayouter)
InvalidateBitmaps();
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source svx/source sw/source
sd/source/filter/eppt/eppt.cxx |2 +-
sd/source/filter/eppt/epptso.cxx |4 ++--
svx/source/gallery2/gallery1.cxx |2 +-
sw/source/filter/ww8/rtfexport.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4229f1b186b84ab36d97b723a6a1f81e79d40d82
Author: Michael Meeks michael.me...@suse.com
Date: Thu Jan 19 17:08:47 2012 +
WaE: ongoing stream operator cleanup, persuade ints they are sal_Int32s
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 7da27aa..1f7606f 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1457,7 +1457,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
mpStrm-Seek( nOfs ); // Fill the VBAInfoAtom with
the correct index to the persisttable
*mpStrm nPersistEntrys
n1
- 2;
+ sal_Int32(2);
mpStrm-Seek( nOldPos );
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7949538..2e5102b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -255,7 +255,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer(
SvStream* pStrm )
(sal_uInt32)( EPP_ViewInfoAtom 16 ) (sal_uInt32)52
(sal_Int32)170 (sal_Int32)200 (sal_Int32)170
(sal_Int32)200 // scaling atom - Keeps the current scale
(sal_Int32)170 (sal_Int32)200 (sal_Int32)170
(sal_Int32)200 // scaling atom - Keeps the previous scale
-(sal_Int32)0x17ac 0xdda// Origin - Keeps the origin
in master coordinates
+(sal_Int32)0x17ac (sal_Int32)0xdda// Origin - Keeps
the origin in master coordinates
(sal_Int32)-780 (sal_Int32)-84 // Origin
(sal_uInt8)1 // bool1 varScale - Set if
zoom to fit is set
(sal_uInt8)0 // bool1 draftMode - Not used
@@ -1151,7 +1151,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream rOut,
int nTextInstance, sal_u
PPTExParaSheet rParaSheet = mpStyleSheet-GetParaSheet( nTextInstance );
rOut (sal_uInt32)( ( EPP_TextHeaderAtom 16 ) | ( nAtomInstance 4
) ) (sal_uInt32)4
- nTextInstance;
+ sal_Int32(nTextInstance);
if ( mbEmptyPresObj )
mnTextSize = 0;
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 64a94ab..0ac9fab 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -285,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject
rBaseURL, sal_Bool rbDirIsR
if( pTestStm )
{
-*pTestStm 1;
+*pTestStm sal_Int32(1);
if( pTestStm-GetError() )
rbDirIsReadOnly = sal_True;
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 8534f82..6a9679f 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -715,7 +715,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const
SwFmt rFmt )
if (((const
SwTxtFmtColl*)pParent)-IsAssignedToListLevelOfOutlineStyle())
{
// Level 9 disables the outline
-Strm() OOO_STRING_SVTOOLS_RTF_LEVEL 9;
+Strm() OOO_STRING_SVTOOLS_RTF_LEVEL sal_Int32(9);
bRet = true;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/core/stlpool.cxx | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
New commits:
commit 897aa4fa71813ca188b0e1e01ca41ca1e35d415d
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 10 11:42:11 2012 +0100
Tools container rework regression fix (for fdo#41657)
Don't de-reference invalid iterator (and no point in doing anything
with an empty style sheet list anyway).
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index f6ee1bd..3625bbf 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -681,24 +681,26 @@ void SdStyleSheetPool::CopyLayoutSheets(const String
rLayoutName, SdStyleSheetP
std::vectorSfxStyleSheetBase* aOutlineSheets;
CreateOutlineSheetList(rLayoutName,aOutlineSheets);
-std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
-
-SfxStyleSheetBase* pParent = *it;
-++it;
-
-while (it != aOutlineSheets.end())
+if( !aOutlineSheets.empty() )
{
-pSheet = *it;
+std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
+SfxStyleSheetBase* pParent = *it;
+++it;
-if (!pSheet)
-break;
+while (it != aOutlineSheets.end())
+{
+pSheet = *it;
-if (pSheet-GetParent().Len() == 0)
-pSheet-SetParent(pParent-GetName());
+if (!pSheet)
+break;
-pParent = pSheet;
+if (pSheet-GetParent().Len() == 0)
+pSheet-SetParent(pParent-GetName());
-++it;
+pParent = pSheet;
+
+++it;
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/present.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e2b57677d3fcb184606b4efb02c79b3e4847c1a0
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Jan 6 17:08:54 2012 +0400
fdo#44294: overlapped controls
diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index b53facb..6ee3fd8 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -86,8 +86,8 @@ ModalDialog DLG_START_PRESENTATION
{
HelpID = sd:ListBox:DLG_START_PRESENTATION:LB_DIAS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82, 24 ) ;
-Size = MAP_APPFONT ( 111, 80 ) ;
+Pos = MAP_APPFONT ( 96, 24 ) ;
+Size = MAP_APPFONT ( 97, 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
//DDExtraWidth = TRUE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e81e5108b90340419264fa2562cc6b96837fee52 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Dec 19 10:01:29 2011 +0400 impress: slide transition pane: use proper control width diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index bff23fe..6e7862d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SOUND.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSoundWidth ); +aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX ); maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize ); aUpperLeft.setX( nIndent ); @@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SPEED.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSpeedWidth ); +aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX ); maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize ); // fixed line Modify Transition ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/presenter/SlideRenderer.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 54bc5bc910e6082398d6b2f55fa7dba65421bbb7
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Nov 17 19:03:08 2011 +0900
removed useless code
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx
b/sd/source/ui/presenter/SlideRenderer.cxx
index 148e832..ea2f14f 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -104,17 +104,7 @@ void SAL_CALL SlideRenderer::initialize (const
SequenceAny rArguments)
{
ThrowIfDisposed();
-if (rArguments.getLength() == 0)
-{
-try
-{
-}
-catch (RuntimeException)
-{
-throw;
-}
-}
-else
+if (rArguments.getLength() != 0)
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM(SlideRenderer: invalid
number of arguments)),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source unusedcode.easy vcl/inc vcl/source
sd/source/filter/eppt/grouptable.hxx |1 -
sd/source/filter/eppt/pptx-grouptable.cxx |8
unusedcode.easy |4
vcl/inc/salgdi.hxx|5 -
vcl/inc/vcl/graph.h |1 -
vcl/inc/vcl/graph.hxx |7 ---
vcl/source/gdi/graph.cxx | 18 --
vcl/source/gdi/impgraph.cxx | 13 -
vcl/source/gdi/salgdilayout.cxx |8
9 files changed, 65 deletions(-)
New commits:
commit a84651f39d4afe662181f695a1a15c4dfe96e7e6
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Nov 20 04:06:00 2011 +0100
Remove some unused methods
diff --git a/sd/source/filter/eppt/grouptable.hxx
b/sd/source/filter/eppt/grouptable.hxx
index d9e1166..23b2951 100644
--- a/sd/source/filter/eppt/grouptable.hxx
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -72,7 +72,6 @@ class GroupTable
::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess
GetCurrentGroupAccess() const { return
mpGroupEntry[ mnCurrentGroupEntry - 1 ]-mXIndexAccess; };
sal_uInt32 GetGroupsClosed();
-voidSkipCurrentGroup();
voidResetGroupTable( sal_uInt32 nCount );
voidClearGroupTable();
sal_BoolEnterGroup( ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess rIndex );
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx
b/sd/source/filter/eppt/pptx-grouptable.cxx
index fed63ac..18f4019 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -131,12 +131,4 @@ sal_Bool GroupTable::GetNextGroupEntry()
//
-
-void GroupTable::SkipCurrentGroup()
-{
-if ( mnCurrentGroupEntry )
-delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-}
-
-//
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 46e92f4..40bb39a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -145,10 +145,6 @@ GDIMetaFile::Wind(unsigned long)
GDIMetaFile::WindEnd()
GDIMetaFile::WindNext()
GraphCtrl::GraphCtrl(Window*, long)
-Graphic::Draw(OutputDevice*, String const, Font, Bitmap const, Point
const, Size const)
-Graphic::StartAnimation(OutputDevice*, Point const, long, OutputDevice*)
-GraphicReader::IsPreviewModeEnabled() const
-GroupTable::SkipCurrentGroup()
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
HTMLControls::Insert(HTMLControl const*, unsigned short)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 75559cb..1394c17 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -470,11 +470,6 @@ public:
Rectangle rNativeContentRegion,
const OutputDevice *pOutDev );
-static void AddDevFontSubstitute( OutputDevice* pOutDev,
- const String rFontName,
- const String rReplaceFontName,
- sal_uInt16 nFlags = 0 );
-
bool DrawAlphaBitmap( const SalTwoRect,
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap,
diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index 1df2ee7..b926936 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.h
@@ -73,7 +73,6 @@ public:
// TODO: when incompatible changes are possible again
// the preview size hint should be redone
-sal_BoolIsPreviewModeEnabled() const;
voidDisablePreviewMode();
voidSetPreviewSize( const Size );
SizeGetPreviewSize() const;
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index d34a213..c5d57f4 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -155,19 +155,12 @@ public:
voidDraw( OutputDevice* pOutDev,
const Point rDestPt,
const Size rDestSize ) const;
-static void Draw( OutputDevice* pOutDev, const String rText,
- Font rFont, const Bitmap rBitmap,
- const Point rDestPt, const Size rDestSize );
static void DrawEx( OutputDevice* pOutDev, const String rText,
Font rFont, const BitmapEx rBitmap,
const Point rDestPt, const Size rDestSize );
voidStartAnimation( OutputDevice* pOutDev,
const Point rDestPt,
-
[Libreoffice-commits] .: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 84da4113b4ec80cccd5916bf1289564837d6d5f9
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 16 12:37:04 2011 +0100
Fix slideshow crasher
Recursive event loop killed SlideshowImpl object under my hands -
make it stay until we pop out of callstack again.
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 867e3bd..7de8329 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1873,6 +1873,9 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG )
{
+// prevent me from deletion when recursing (App::Reschedule does)
+const rtl::ReferenceSlideshowImpl this_(this);
+
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
Application::Reschedule(true); // fix for fdo#32861 - process
@@ -1888,7 +1891,7 @@ IMPL_LINK( SlideshowImpl, PostYieldListener, void*,
EMPTYARG )
sal_Int32 SlideshowImpl::updateSlideShow (void)
{
-// doing some nMagic
+// prevent me from deletion when recursing (App::EnableYieldMode does)
const rtl::ReferenceSlideshowImpl this_(this);
Reference XSlideShow xShow( mxShow );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source starmath/source
sd/source/core/drawdoc3.cxx|4
sd/source/ui/docshell/docshel3.cxx |4
sd/source/ui/docshell/docshell.cxx |5 -
sd/source/ui/func/fuinsfil.cxx |4
sd/source/ui/func/fuprlout.cxx |2 --
starmath/source/document.cxx |5 -
6 files changed, 24 deletions(-)
New commits:
commit 307535d98aeb171ee5e291b77f6c5028b4db936d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Nov 5 00:04:36 2011 +0900
removed unused macro
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 97553d3..06e874d 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -81,10 +81,6 @@
using namespace ::com::sun::star;
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
/*
|*
|* Oeffnet ein Bookmark-Dokument
diff --git a/sd/source/ui/docshell/docshel3.cxx
b/sd/source/ui/docshell/docshel3.cxx
index 75cbaf8..b5ab8da 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -72,10 +72,6 @@ using namespace ::com::sun::star::uno;
namespace sd {
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
/*
|*
|* SFX-Requests bearbeiten
diff --git a/sd/source/ui/docshell/docshell.cxx
b/sd/source/ui/docshell/docshell.cxx
index ce1f946..67d526a 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -95,11 +95,6 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
namespace sd {
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
-
GraphicFilter* GetGrfFilter();
/*
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index fed1af0..5a976b8 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -85,10 +85,6 @@ namespace sd {
TYPEINIT1( FuInsertFile, FuPoor );
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
/*
|*
|* Konstruktor
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 35cf5d4..037690d 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -75,8 +75,6 @@ SO2_DECL_REF(SvStorage)
TYPEINIT1( FuPresentationLayout, FuPoor );
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
#define DOCUMENT_TOKEN (sal_Unicode('#'))
/*
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 5b00574..0ce9275 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -111,11 +111,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
-
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
-static const char pStarMathDoc[] = StarMathDocument;
-
#define SmDocShell
#include smslots.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/tpaction.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51dcb469c013d3a8a301ca8e86dde3a420b5417f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 26 11:17:32 2011 +0200
Fixed DBG_ASSERT broken by recent commit.
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 0e64d89..25eeafd 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -189,7 +189,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
SvxColorListItem aItem( *(const SvxColorListItem*)( pDocSh-GetItem(
SID_COLOR_TABLE ) ) );
pColList = aItem.GetColorList();
-DBG_ASSERT( pColList, Keine Farbtabelle vorhanden! );
+DBG_ASSERT( pColList.is(), Keine Farbtabelle vorhanden! );
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/slideshow/slideshow.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit d543cb25e16b1f80d0b2826dc1046ba752199e81
Author: Armin Le Grand armin.le.gr...@me.com
Date: Thu Sep 22 17:33:48 2011 +0200
Fix #i118456# make sure TextEdit changes get pushed to model
(cherry-picked from http://svn.apache.org/viewvc?rev=1174130view=rev)
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 464aa4f..28282ed 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -869,6 +869,18 @@ void SAL_CALL SlideShow::startWithArguments( const
Sequence PropertyValue rA
}
}
+// #118456# make sure TextEdit changes get pushed to model.
+// mpDrawView is tested against NULL above already.
+if(mpCurrentViewShellBase)
+{
+ViewShell* pViewShell =
mpCurrentViewShellBase-GetMainViewShell().get();
+
+if(pViewShell pViewShell-GetView())
+{
+pViewShell-GetView()-SdrEndTextEdit();
+}
+}
+
// Start either a full-screen or an in-place show.
if(mxCurrentSettings-mbFullScreen !mxCurrentSettings-mbPreview)
StartFullscreenPresentation();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
