[Libreoffice-commits] .: sd/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 01:04:21 PST 2010
sd/source/ui/app/res_bmp.src | 52 ----------
sd/source/ui/dlg/inspagob.cxx | 8 -
sd/source/ui/dlg/navigatr.cxx | 13 +-
sd/source/ui/dlg/sdtreelb.cxx | 174 ++++++++++++------------------------
sd/source/ui/inc/res_bmp.hrc | 20 ----
sd/source/ui/inc/sdtreelb.hxx | 36 +++----
sd/source/ui/toolpanel/TitleBar.cxx | 29 ++----
sd/source/ui/unoidl/unopage.cxx | 55 +++++------
8 files changed, 130 insertions(+), 257 deletions(-)
New commits:
commit fefa92f2ce159b56a5473a43ea04770bb77b49b9
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 9 20:09:34 2010 -0800
Bitmap Tree Cleanup - impress
Removed all references to HIGHCONTRAST mode from svtools classes:
SvImpLBox
SvTreeListBox
The reset is just fall out.
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 2996640..17d5b1a 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -280,98 +280,50 @@ Bitmap BMP_PAGE_EXCLUDED
{
File = "pageexcl.bmp" ;
};
-Bitmap BMP_PAGE_EXCLUDED_H
-{
- File = "pageexcl_h.bmp" ;
-};
Bitmap BMP_PAGEOBJS_EXCLUDED
{
File = "pagobjex.bmp" ;
};
-Bitmap BMP_PAGEOBJS_EXCLUDED_H
-{
- File = "pagobjex_h.bmp" ;
-};
Bitmap BMP_PAGEOBJS
{
File = "pageobjs.bmp" ;
};
-Bitmap BMP_PAGEOBJS_H
-{
- File = "pageobjs_h.bmp" ;
-};
Bitmap BMP_OBJECTS
{
File = "objects.bmp" ;
};
-Bitmap BMP_OBJECTS_H
-{
- File = "objects_h.bmp" ;
-};
Bitmap BMP_OLE
{
File = "ole.bmp" ;
};
-Bitmap BMP_OLE_H
-{
- File = "ole_h.bmp" ;
-};
Bitmap BMP_GROUP
{
File = "group.bmp" ;
};
-Bitmap BMP_GROUP_H
-{
- File = "group_h.bmp" ;
-};
Bitmap BMP_DOC_OPEN
{
File = "docopen.bmp" ;
};
-Bitmap BMP_DOC_OPEN_H
-{
- File = "docopen_h.bmp" ;
-};
Bitmap BMP_DOC_CLOSED
{
File = "docclose.bmp" ;
};
-Bitmap BMP_DOC_CLOSED_H
-{
- File = "docclose_h.bmp" ;
-};
Bitmap BMP_DOC_TEXT
{
File = "doctext.bmp" ;
};
-Bitmap BMP_DOC_TEXT_H
-{
- File = "doctext_h.bmp" ;
-};
Bitmap BMP_EXPAND
{
File = "plus.bmp" ;
};
-Bitmap BMP_EXPAND_H
-{
- File = "plus_h.bmp" ;
-};
Bitmap BMP_COLLAPSE
{
File = "minus.bmp" ;
};
-Bitmap BMP_COLLAPSE_H
-{
- File = "minus_h.bmp" ;
-};
Bitmap BMP_GRAPHIC
{
File = "graphic.bmp" ;
};
-Bitmap BMP_GRAPHIC_H
-{
- File = "graphic_h.bmp" ;
-};
Image IMG_PIPETTE_H
{
ImageBitmap = Bitmap { File = "pipette_h.bmp" ; };
@@ -426,7 +378,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
{
< STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
};
- };
+ };
};
#define STYLE_IMAGE_LISTEF \
IdList = \
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index a447942..58d3c56 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -111,11 +111,7 @@ void SdInsertPagesObjsDlg::Reset()
Color aColor( COL_WHITE );
Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) );
Image aImgText( aBmpText, aColor );
- Bitmap aBmpTextH( SdResId( BMP_DOC_TEXT_H ) );
- Image aImgTextH( aBmpTextH, Color( COL_BLACK ) );
- SvLBoxEntry* pEntry = aLbTree.InsertEntry( rName, aImgText, aImgText );
- aLbTree.SetExpandedEntryBmp( pEntry, aImgTextH, BMP_COLOR_HIGHCONTRAST );
- aLbTree.SetCollapsedEntryBmp( pEntry, aImgTextH, BMP_COLOR_HIGHCONTRAST );
+ aLbTree.InsertEntry( rName, aImgText, aImgText );
}
aCbxMasters.Check( TRUE );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 6cbeb3a..c3acb30 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -109,7 +109,7 @@ SdNavigatorWin::SdNavigatorWin(
// Shape filter drop down menu.
maToolbox.SetItemBits(TBI_SHAPE_FILTER,
maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY);
-
+
// TreeListBox
// set position below toolbox
long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4;
@@ -187,7 +187,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE);
else
maToolbox.EnableItem(TBI_SHAPE_FILTER);
-
+
if( !maTlbObjects.IsEqualToDoc( pDoc ) )
{
String aDocName = pDocShell->GetMedium()->GetName();
@@ -340,7 +340,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
//pBox->Invalidate();
}
break;
-
+
case TBI_SHAPE_FILTER:
{
PopupMenu *pMenu = new PopupMenu;
@@ -534,7 +534,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
}
}
}
-
+
return 0;
}
@@ -863,8 +863,7 @@ void SdNavigatorWin::ApplyImageList()
const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList );
-
- maToolbox.SetItemImage(TBI_SHAPE_FILTER, BitmapEx(SdResId( bHighContrast ? BMP_GRAPHIC_H : BMP_GRAPHIC)));
+ maToolbox.SetItemImage( TBI_SHAPE_FILTER, BitmapEx( SdResId( BMP_GRAPHIC ) ) );
SetDragImage();
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 3772a4f..4ac75b6 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -57,7 +57,7 @@
#include <svtools/embedtransfer.hxx>
#include <tools/diagnose_ex.h>
#include <ViewShell.hxx>
-
+
using namespace com::sun::star;
class SdPageObjsTLB::IconProvider
@@ -72,22 +72,14 @@ public:
Image maImgPageObjs;
Image maImgObjects;
Image maImgGroup;
-
- // High contrast icons.
- Image maImgPageH;
- Image maImgPageExclH;
- Image maImgPageObjsExclH;
- Image maImgPageObjsH;
- Image maImgObjectsH;
- Image maImgGroupH;
};
BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE;
BOOL SdPageObjsTLB::IsInDrag()
-{
- return bIsInDrag;
+{
+ return bIsInDrag;
}
sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32;
@@ -96,8 +88,8 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MA
// - SdPageObjsTLB::SdPageObjsTransferable -
// -----------------------------------------
-SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
- SdPageObjsTLB& rParent,
+SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
+ SdPageObjsTLB& rParent,
const INetBookmark& rBookmark,
::sd::DrawDocShell& rDocShell,
NavigatorDragType eDragType,
@@ -109,7 +101,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
meDragType( eDragType ),
maTreeListBoxData( rTreeListBoxData )
{
-}
+}
@@ -121,7 +113,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable()
// -----------------------------------------------------------------------------
void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
-{
+{
AddFormat(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK);
AddFormat(SOT_FORMATSTR_ID_TREELISTBOX);
AddFormat(GetListBoxDropFormatId());
@@ -239,7 +231,7 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
|*
\************************************************************************/
-SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
+SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
: SvTreeListBox ( pParentWin, rSdResId )
, mpParent ( pParentWin )
, mpDoc ( NULL )
@@ -248,8 +240,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
, mpOwnMedium ( NULL )
, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) )
, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) )
-, maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) )
-, maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) )
, mbLinkableSelected ( FALSE )
, mpDropNavWin ( NULL )
, mbShowAllShapes ( false )
@@ -264,10 +254,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ),
Bitmap( SdResId( BMP_COLLAPSE ) ) );
- SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND_H ) ),
- Bitmap( SdResId( BMP_COLLAPSE_H ) ),
- BMP_COLOR_HIGHCONTRAST );
-
SetDragDropMode(
SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY |
SV_DRAGDROP_APP_MOVE | SV_DRAGDROP_APP_COPY | SV_DRAGDROP_APP_DROP );
@@ -460,20 +446,11 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
Image aImgDocOpen=Image( BitmapEx( SdResId( BMP_DOC_OPEN ) ) );
Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
- Image aImgDocOpenH=Image( BitmapEx( SdResId( BMP_DOC_OPEN_H ) ) );
- Image aImgDocClosedH=Image( BitmapEx( SdResId( BMP_DOC_CLOSED_H ) ) );
// Dokumentnamen einfuegen
- SvLBoxEntry* pFileEntry = InsertEntry( maDocName,
- aImgDocOpen,
- aImgDocClosed,
- NULL,
- TRUE,
- LIST_APPEND,
- reinterpret_cast< void* >( 1 ) );
-
- SetExpandedEntryBmp( pFileEntry, aImgDocOpenH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pFileEntry, aImgDocClosedH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, TRUE, LIST_APPEND,
+ reinterpret_cast< void* >( 1 )
+ );
}
@@ -506,15 +483,6 @@ void SdPageObjsTLB::AddShapeList (
LIST_APPEND,
pUserData);
- SetExpandedEntryBmp(
- pEntry,
- bIsExcluded ? rIconProvider.maImgPageExclH : rIconProvider.maImgPageH,
- BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp(
- pEntry,
- bIsExcluded ? rIconProvider.maImgPageExclH : rIconProvider.maImgPageH,
- BMP_COLOR_HIGHCONTRAST );
-
SdrObjListIter aIter(
rList,
!rList.HasObjectNavigationOrder() /* use navigation order, if available */,
@@ -533,19 +501,27 @@ void SdPageObjsTLB::AddShapeList (
{
if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
{
- SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgOle, maImgOle, pEntry,
- FALSE, LIST_APPEND, pObj);
-
- SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(
+ aStr,
+ maImgOle,
+ maImgOle,
+ pEntry,
+ FALSE,
+ LIST_APPEND,
+ pObj
+ );
}
else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF )
{
- SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgGraphic, maImgGraphic, pEntry,
- FALSE, LIST_APPEND, pObj );
-
- SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(
+ aStr,
+ maImgGraphic,
+ maImgGraphic,
+ pEntry,
+ FALSE,
+ LIST_APPEND,
+ pObj
+ );
}
else if (pObj->IsGroupObject())
{
@@ -555,15 +531,20 @@ void SdPageObjsTLB::AddShapeList (
aStr,
false,
pEntry,
- rIconProvider);
+ rIconProvider
+ );
}
else
{
- SvLBoxEntry* pNewEntry = InsertEntry( aStr, rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry,
- FALSE, LIST_APPEND, pObj );
-
- SetExpandedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(
+ aStr,
+ rIconProvider.maImgObjects,
+ rIconProvider.maImgObjects,
+ pEntry,
+ FALSE,
+ LIST_APPEND,
+ pObj
+ );
}
}
}
@@ -576,14 +557,6 @@ void SdPageObjsTLB::AddShapeList (
SetCollapsedEntryBmp(
pEntry,
bIsExcluded ? rIconProvider.maImgPageObjsExcl : rIconProvider.maImgPageObjs);
- SetExpandedEntryBmp(
- pEntry,
- bIsExcluded ? rIconProvider.maImgPageObjsExclH : rIconProvider.maImgPageObjsH,
- BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(
- pEntry,
- bIsExcluded ? rIconProvider.maImgPageObjsExclH : rIconProvider.maImgPageObjsH,
- BMP_COLOR_HIGHCONTRAST);
}
}
@@ -744,12 +717,9 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
SdPage* pPage = NULL;
SvLBoxEntry* pPageEntry = NULL;
- Image aImgPage=Image( BitmapEx( SdResId( BMP_PAGE ) ) );
- Image aImgPageObjs=Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
- Image aImgObjects=Image( BitmapEx( SdResId( BMP_OBJECTS ) ) );
- Image aImgPageH=Image( BitmapEx( SdResId( BMP_PAGE_H ) ) );
- Image aImgPageObjsH=Image( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) );
- Image aImgObjectsH=Image( BitmapEx( SdResId( BMP_OBJECTS_H ) ) );
+ Image aImgPage = Image( BitmapEx( SdResId( BMP_PAGE ) ) );
+ Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
+ Image aImgObjects = Image( BitmapEx( SdResId( BMP_OBJECTS ) ) );
// document name already inserted
@@ -770,9 +740,6 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
LIST_APPEND,
reinterpret_cast< void* >( 1 ) );
- SetExpandedEntryBmp( pPageEntry, aImgPageH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pPageEntry, aImgPageH, BMP_COLOR_HIGHCONTRAST );
-
SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
while( aIter.IsMore() )
@@ -783,34 +750,22 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
{
if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
{
- SvLBoxEntry* pNewEntry = InsertEntry(aStr, maImgOle, maImgOle, pPageEntry);
-
-
- SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(aStr, maImgOle, maImgOle, pPageEntry);
}
else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF )
{
- SvLBoxEntry* pNewEntry = InsertEntry(aStr, maImgGraphic, maImgGraphic, pPageEntry);
-
- SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(aStr, maImgGraphic, maImgGraphic, pPageEntry);
}
else
{
- SvLBoxEntry* pNewEntry = InsertEntry(aStr, aImgObjects, aImgObjects, pPageEntry);
-
- SetExpandedEntryBmp( pNewEntry, aImgObjectsH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, aImgObjectsH, BMP_COLOR_HIGHCONTRAST );
+ InsertEntry(aStr, aImgObjects, aImgObjects, pPageEntry);
}
}
}
if( pPageEntry->HasChilds() )
{
- SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
+ SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
SetCollapsedEntryBmp( pPageEntry, aImgPageObjs );
- SetExpandedEntryBmp( pPageEntry, aImgPageObjsH, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pPageEntry, aImgPageObjsH, BMP_COLOR_HIGHCONTRAST );
}
}
nPage++;
@@ -975,10 +930,10 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
{
(void)nAction;
(void)rPosPixel;
-
+
SdNavigatorWin* pNavWin = NULL;
SvLBoxEntry* pEntry = GetEntry(rPosPixel);
-
+
if( mpFrame->HasChildWindow( SID_NAVIGATOR ) )
pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) );
@@ -1060,7 +1015,7 @@ void SdPageObjsTLB::DoDrag()
::com::sun::star::uno::Sequence<sal_Int8> aSequence (sizeof(SvLBoxDDInfo));
memcpy(aSequence.getArray(), (sal_Char*)&aDDInfo, sizeof(SvLBoxDDInfo));
::com::sun::star::uno::Any aTreeListBoxData (aSequence);
-
+
// object is destroyed by internal reference mechanism
SdTransferable* pTransferable = new SdPageObjsTLB::SdPageObjsTransferable(
*this, aBookmark, *pDocShell, eDragType, aTreeListBoxData);
@@ -1141,7 +1096,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 )
sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
{
sal_Int8 nResult (DND_ACTION_NONE);
-
+
if ( !bIsInDrag && IsDropFormatSupported( FORMAT_FILE ) )
{
nResult = rEvent.mnAction;
@@ -1170,11 +1125,11 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
}
}
}
-
+
// Hide emphasis when there is no valid drop action.
if (nResult == DND_ACTION_NONE)
ImplShowTargetEmphasis(pTargetEntry, FALSE);
-
+
return nResult;
}
@@ -1194,15 +1149,15 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
SdNavigatorWin* pNavWin = NULL;
USHORT nId = SID_NAVIGATOR;
-
+
if( mpFrame->HasChildWindow( nId ) )
pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) );
-
+
if( pNavWin && ( pNavWin == mpParent ) )
{
TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable );
String aFile;
-
+
if( aDataHelper.GetString( FORMAT_FILE, aFile ) &&
( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) )
{
@@ -1335,7 +1290,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
if (pEntry == NULL)
return NULL;
- OSL_TRACE("entry is %s",
+ OSL_TRACE("entry is %s",
::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr());
if (GetParent(pEntry) == NULL)
{
@@ -1359,7 +1314,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
else
break;
}
- OSL_TRACE("returning %s",
+ OSL_TRACE("returning %s",
::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr());
}
@@ -1373,7 +1328,7 @@ bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry)
{
if (pEntry == NULL)
return false;
-
+
if ( ! IsDropFormatSupported(SdPageObjsTransferable::GetListBoxDropFormatId()))
return false;
@@ -1447,14 +1402,7 @@ SdPageObjsTLB::IconProvider::IconProvider (void)
maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ),
maImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ),
maImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ),
- maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) ),
-
- maImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) ),
- maImgPageExclH( BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) ) ),
- maImgPageObjsExclH( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) ) ),
- maImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) ),
- maImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) ),
- maImgGroupH( BitmapEx( SdResId( BMP_GROUP_H ) ) )
+ maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) )
{
}
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 192ee97..6ed00c8 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -128,7 +128,7 @@
#define BMP_FOIL_22 RID_APP_START+157
#define BMP_FOIL_23 RID_APP_START+158
#define BMP_FOIL_24 RID_APP_START+159
-
+
#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165
#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166
#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167
@@ -139,20 +139,8 @@
#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172
#define BMP_PAGE_H RID_SD_START+213
-#define BMP_PAGEOBJS_H RID_SD_START+214
-#define BMP_OBJECTS_H RID_SD_START+215
-#define BMP_DOC_OPEN_H RID_SD_START+216
-#define BMP_DOC_CLOSED_H RID_SD_START+217
-#define BMP_DOC_TEXT_H RID_SD_START+218
-#define BMP_OLE_H RID_SD_START+219
-#define BMP_PAGE_EXCLUDED_H RID_SD_START+220
-#define BMP_PAGEOBJS_EXCLUDED_H RID_SD_START+221
-#define BMP_EXPAND_H RID_SD_START+222
-#define BMP_COLLAPSE_H RID_SD_START+223
-#define BMP_GRAPHIC_H RID_SD_START+224
#define BMP_FOIL_NONE_H RID_SD_START+225
-#define BMP_GROUP_H RID_SD_START+226
#define BMP_WAIT_ICON_H RID_SD_START+229
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
@@ -209,7 +197,7 @@
#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order!
#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402)
#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403)
-#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404)
+#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404)
#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405)
#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406)
#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407)
@@ -218,7 +206,7 @@
#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410)
#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410)
#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410)
-#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411)
+#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411)
#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412)
#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413)
#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414)
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 9f5919f..b792a2d 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -66,7 +66,7 @@ SV_DECL_REF(DrawDocShell)
class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
{
private:
-
+
static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
public:
@@ -75,15 +75,15 @@ public:
class SdPageObjsTransferable : public SdTransferable
{
public:
- SdPageObjsTransferable(
- SdPageObjsTLB& rParent,
+ SdPageObjsTransferable(
+ SdPageObjsTLB& rParent,
const INetBookmark& rBookmark,
::sd::DrawDocShell& rDocShell,
NavigatorDragType eDragType,
const ::com::sun::star::uno::Any& rTreeListBoxData );
::sd::DrawDocShell& GetDocShell() const;
NavigatorDragType GetDragType() const;
-
+
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
/** Return a temporary transferable data flavor that is used
@@ -91,7 +91,7 @@ public:
lifetime ends with the office application.
*/
static sal_uInt32 GetListBoxDropFormatId (void);
-
+
private:
/** Temporary drop flavor id that is used internally in the
navigator.
@@ -105,7 +105,7 @@ public:
const ::com::sun::star::uno::Any maTreeListBoxData;
SD_DLLPRIVATE virtual ~SdPageObjsTransferable();
-
+
SD_DLLPRIVATE virtual void AddSupportedFormats();
SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction );
@@ -127,7 +127,7 @@ public:
bool PageBelongsToCurrentShow (const SdPage* pPage) const;
protected:
-
+
Window* mpParent;
const SdDrawDocument* mpDoc;
SdDrawDocument* mpBookmarkDoc;
@@ -135,8 +135,6 @@ protected:
SfxMedium* mpOwnMedium;
Image maImgOle;
Image maImgGraphic;
- Image maImgOleH;
- Image maImgGraphicH;
BOOL mbLinkableSelected;
BOOL mbDragEnabled;
String maDocName;
@@ -145,7 +143,7 @@ protected:
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
- // DragSourceHelper
+ // DragSourceHelper
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
// DropTargetHelper
@@ -153,7 +151,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void RequestingChilds( SvLBoxEntry* pParent );
-
+
void DoDrag();
void OnDragFinished( sal_uInt8 nDropAction );
@@ -173,7 +171,7 @@ protected:
String GetObjectName (
const SdrObject* pObject,
const bool bCreate = true) const;
- void CloseBookmarkDoc();
+ void CloseBookmarkDoc();
DECL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*);
/** Handle the reordering of entries in the navigator. This method
@@ -185,21 +183,21 @@ protected:
SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent,
ULONG& rNewChildPos);
-
+
using Window::GetDropTarget;
virtual SvLBoxEntry* GetDropTarget (const Point& rLocation);
public:
-
+
SdPageObjsTLB( Window* pParent, const SdResId& rSdResId );
~SdPageObjsTLB();
virtual void SelectHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
-
+
void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; }
SfxViewFrame* GetViewFrame() const { return mpFrame; }
-
+
void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName );
void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName );
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
@@ -211,9 +209,9 @@ public:
List* GetSelectEntryList( USHORT nDepth );
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
-
+
BOOL IsLinkableSelected() const { return mbLinkableSelected; }
-
+
static BOOL IsInDrag();
using SvLBox::ExecuteDrop;
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index 83f39e6..4e4d6da 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -59,7 +59,7 @@
namespace sd { namespace toolpanel {
const int TitleBar::snIndentationWidth = 16;
-
+
TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable)
: ::Window (pParent, WB_TABSTOP)
, TreeNode(this)
@@ -252,7 +252,6 @@ bool TitleBar::HasExpansionIndicator (void) const
Image TitleBar::GetExpansionIndicator (void) const
{
Image aIndicator;
- bool bHighContrastMode (GetSettings().GetStyleSettings().GetHighContrastMode() != 0);
if (mbIsExpandable)
{
USHORT nResourceId = 0;
@@ -260,15 +259,9 @@ Image TitleBar::GetExpansionIndicator (void) const
{
case TBT_SUB_CONTROL_HEADLINE:
if (mbExpanded)
- if (bHighContrastMode)
- nResourceId = BMP_COLLAPSE_H;
- else
- nResourceId = BMP_COLLAPSE;
+ nResourceId = BMP_COLLAPSE;
else
- if (bHighContrastMode)
- nResourceId = BMP_EXPAND_H;
- else
- nResourceId = BMP_EXPAND;
+ nResourceId = BMP_EXPAND;
aIndicator = IconCache::Instance().GetIcon(nResourceId);
break;
@@ -287,7 +280,7 @@ void TitleBar::PaintSubPanelHeadLineBar (void)
Rectangle aTextBox (CalculateTextBoundingBox (nWidth, true));
Rectangle aTitleBarBox (CalculateTitleBarBox(aTextBox, nWidth));
- int nVerticalOffset = -aTitleBarBox.Top();
+ int nVerticalOffset = -aTitleBarBox.Top();
aTitleBarBox.Top() += nVerticalOffset;
aTitleBarBox.Bottom() += nVerticalOffset;
aTextBox.Top() += nVerticalOffset;
@@ -353,7 +346,7 @@ Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox)
if (meType == TBT_SUB_CONTROL_HEADLINE)
aPosition.X() += 3;
mpDevice->DrawImage (aPosition, aImage);
-
+
aExpansionIndicatorArea = Rectangle (
aPosition, aImage.GetSizePixel());
}
@@ -377,9 +370,9 @@ USHORT TitleBar::GetTextStyle (void)
{
if(IsEnabled())
{
- return TEXT_DRAW_LEFT
+ return TEXT_DRAW_LEFT
| TEXT_DRAW_TOP
- | TEXT_DRAW_MULTILINE
+ | TEXT_DRAW_MULTILINE
| TEXT_DRAW_WORDBREAK;
}
else
@@ -452,7 +445,7 @@ Rectangle TitleBar::CalculateTextBoundingBox (
Rectangle aTextBox (
Point(0,0),
- Size (nAvailableWidth,
+ Size (nAvailableWidth,
GetSettings().GetStyleSettings().GetTitleHeight()));
aTextBox.Top() += (aTextBox.GetHeight() - GetTextHeight()) / 2;
if (HasExpansionIndicator())
@@ -531,7 +524,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent)
mpDevice.reset(new VirtualDevice (*this));
// fall through.
-
+
case DATACHANGED_FONTS:
case DATACHANGED_FONTSUBSTITUTION:
{
@@ -542,7 +535,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent)
if (IsControlFont())
aFont.Merge(GetControlFont());
SetZoomedPointFont(aFont);
-
+
// Color.
Color aColor;
if (IsControlForeground())
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index e0232bb..abb1904 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1,8 +1,8 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /* -*- 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
@@ -112,7 +112,7 @@ enum WID_PAGE
WID_PAGE_BACK, WID_PAGE_PREVIEW, WID_PAGE_PREVIEWBITMAP, WID_PAGE_VISIBLE, WID_PAGE_SOUNDFILE, WID_PAGE_BACKFULL,
WID_PAGE_BACKVIS, WID_PAGE_BACKOBJVIS, WID_PAGE_USERATTRIBS, WID_PAGE_BOOKMARK, WID_PAGE_ISDARK,
WID_PAGE_HEADERVISIBLE, WID_PAGE_HEADERTEXT, WID_PAGE_FOOTERVISIBLE, WID_PAGE_FOOTERTEXT,
- WID_PAGE_PAGENUMBERVISIBLE, WID_PAGE_DATETIMEVISIBLE, WID_PAGE_DATETIMEFIXED,
+ WID_PAGE_PAGENUMBERVISIBLE, WID_PAGE_DATETIMEVISIBLE, WID_PAGE_DATETIMEFIXED,
WID_PAGE_DATETIMETEXT, WID_PAGE_DATETIMEFORMAT, WID_TRANSITION_TYPE, WID_TRANSITION_SUBTYPE,
WID_TRANSITION_DIRECTION, WID_TRANSITION_FADE_COLOR, WID_TRANSITION_DURATION, WID_LOOP_SOUND,
WID_NAVORDER
@@ -211,7 +211,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{
DRAW_PAGE_NOTES_PROPERTIES
};
-
+
#define GRAPHIC_PAGE_PROPERTIES \
{ MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \
{ MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \
@@ -229,41 +229,41 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
{ MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, \
{ MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \
- {0,0,0,0,0,0}
+ {0,0,0,0,0,0}
static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
{
{ MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0},
GRAPHIC_PAGE_PROPERTIES
};
- static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
+ static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
{
GRAPHIC_PAGE_PROPERTIES
};
//
bool bWithoutBackground = ePageKind != PK_STANDARD && ePageKind != PK_HANDOUT;
- const SvxItemPropertySet* pRet = 0;
+ const SvxItemPropertySet* pRet = 0;
if( bImpress )
{
if( ePageKind == PK_STANDARD )
{
//PK_STANDARD always has a background property
static SvxItemPropertySet aDrawPagePropertySet_Impl( aDrawPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aDrawPagePropertySet_Impl;
+ pRet = &aDrawPagePropertySet_Impl;
}
else
{
if(bWithoutBackground)
{
static SvxItemPropertySet aDrawPageNotesHandoutPropertyNoBackSet_Impl( aDrawPageNotesHandoutPropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aDrawPageNotesHandoutPropertyNoBackSet_Impl;
- }
+ pRet = &aDrawPageNotesHandoutPropertyNoBackSet_Impl;
+ }
else
{
static SvxItemPropertySet aDrawPageNotesHandoutPropertySet_Impl( aDrawPageNotesHandoutPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aDrawPageNotesHandoutPropertySet_Impl;
- }
+ pRet = &aDrawPageNotesHandoutPropertySet_Impl;
+ }
}
}
else
@@ -271,13 +271,13 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
if(bWithoutBackground)
{
static SvxItemPropertySet aGraphicPagePropertyNoBackSet_Impl( aGraphicPagePropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aGraphicPagePropertyNoBackSet_Impl;
- }
+ pRet = &aGraphicPagePropertyNoBackSet_Impl;
+ }
else
{
static SvxItemPropertySet aGraphicPagePropertySet_Impl( aGraphicPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aGraphicPagePropertySet_Impl;
- }
+ pRet = &aGraphicPagePropertySet_Impl;
+ }
}
return pRet;
}
@@ -333,12 +333,12 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
if( ePageKind == PK_HANDOUT )
{
static SvxItemPropertySet aHandoutMasterPagePropertySet_Impl( aHandoutMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aHandoutMasterPagePropertySet_Impl;
+ pRet = &aHandoutMasterPagePropertySet_Impl;
}
else
{
static SvxItemPropertySet aMasterPagePropertySet_Impl( aMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
- pRet = &aMasterPagePropertySet_Impl;
+ pRet = &aMasterPagePropertySet_Impl;
}
return pRet;
}
@@ -742,7 +742,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
break;
}
}
-
+
throw lang::IllegalArgumentException();
}
@@ -1076,9 +1076,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
}
case WID_PAGE_LDBITMAP:
{
- BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
Reference< awt::XBitmap > xBitmap(
- VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) );
+ VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( BMP_PAGE ) ) ) );
aAny <<= xBitmap;
}
break;
@@ -2074,7 +2073,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
if( mbIsImpressDocument )
{
const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD;
-
+
if( ePageKind != PK_HANDOUT && rType == ITYPE( presentation::XPresentationPage ) )
{
return makeAny( Reference< presentation::XPresentationPage >( this ) );
@@ -2347,7 +2346,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
::sd::ViewShell* pViewSh = pDocSh ? pDocSh->GetViewShell() : NULL;
if( pViewSh && pViewSh->ISA(::sd::DrawViewShell))
{
- ::sd::DrawViewShell* pDrawViewSh = static_cast<
+ ::sd::DrawViewShell* pDrawViewSh = static_cast<
::sd::DrawViewShell*>(pViewSh);
EditMode eMode = pDrawViewSh->GetEditMode();
@@ -2581,7 +2580,7 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation()
{
if( !GetPage() )
throw DisposedException();
-
+
Reference< XAnnotation > xRet;
GetPage()->createAnnotation(xRet);
return xRet;
@@ -2610,7 +2609,7 @@ void SdDrawPage::getBackground( Any& rValue ) throw()
{
// there is a fill set, export to rValue
Reference< beans::XPropertySet > xSet(new SdUnoPageBackground(
- GetModel()->GetDoc(),
+ GetModel()->GetDoc(),
&GetPage()->getSdrPageProperties().GetItemSet()));
rValue <<= xSet;
}
@@ -2782,7 +2781,7 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept
aTypes.push_back(ITYPE(document::XLinkTargetSupplier));
aTypes.push_back(ITYPE( drawing::XShapeCombiner ));
aTypes.push_back(ITYPE( drawing::XShapeBinder ));
- aTypes.push_back(ITYPE( office::XAnnotationAccess ));
+ aTypes.push_back(ITYPE( office::XAnnotationAccess ));
aTypes.push_back(ITYPE( beans::XMultiPropertySet ));
if( bPresPage )
aTypes.push_back(ITYPE(presentation::XPresentationPage));
@@ -2914,7 +2913,7 @@ void SdMasterPage::setBackground( const Any& rValue )
Reference< beans::XPropertyState > xSetStates( xInputSet, UNO_QUERY );
PropertyEntryVector_t aBackgroundProperties = ImplGetPageBackgroundPropertySet()->getPropertyMap()->getPropertyEntries();
- PropertyEntryVector_t::const_iterator aIt = aBackgroundProperties.begin();
+ PropertyEntryVector_t::const_iterator aIt = aBackgroundProperties.begin();
while( aIt != aBackgroundProperties.end() )
{
if( xSetInfo->hasPropertyByName( aIt->sName ) )
@@ -3073,7 +3072,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName )
::sd::ViewShell* pViewSh = pDocSh ? pDocSh->GetViewShell() : NULL;
if( pViewSh && pViewSh->ISA(::sd::DrawViewShell ) )
{
- ::sd::DrawViewShell* pDrawViewSh =
+ ::sd::DrawViewShell* pDrawViewSh =
static_cast< ::sd::DrawViewShell*>(pViewSh);
EditMode eMode = pDrawViewSh->GetEditMode();
More information about the Libreoffice-commits
mailing list