summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg/sdtreelb.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
commit0553d10867217e30a86c88c17ccb15a06030ce07 (patch)
tree4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /sd/source/ui/dlg/sdtreelb.cxx
parentd0ac8f1e7866c637be15f081b59ef456aacb954a (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:26 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962 Merge: 7234327 29a7259 Author: Jan Holesovsky <kendy@suse.cz> Date: Wed Sep 8 11:34:03 2010 +0200 Merge commit 'ooo/OOO330_m7' commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7) Merge: 10146e0 6b04480 Author: Kurt Zenker <kz@openoffice.org> Date: Tue Aug 31 15:10:03 2010 +0200 CWS-TOOLING: integrate CWS impress197 commit 6b04480dd88a5bd048d12874dc8c07630670c239 Author: sj <sj@openoffice.org> Date: Mon Aug 9 14:11:58 2010 +0200 impress197: #163250# fixed string handling, improved polygon splitting sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++------------- 1 files changed, 83 insertions(+), 45 deletions(-) commit a37d85f979d1616b158c918762821ed82b1e0691 Merge: 1380a03 d766efe Author: Christian Lippka <christian.lippka@sun.com> Date: Fri Aug 6 14:53:07 2010 +0200 merge commit 1380a03aaf7464643eb99de1488ab5b372663ccd Author: Christian Lippka <christian.lippka@sun.com> Date: Wed Aug 4 10:48:35 2010 +0200 #i113603# only change layout shape size on init or of user call is set sd/source/core/sdpage.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8 Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> Date: Thu Jan 1 00:00:00 1970 +0000 impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor. sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++-- sd/source/ui/view/sdwindow.cxx | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-)
Notes
Notes: split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sd/source/ui/dlg/sdtreelb.cxx')
-rwxr-xr-xsd/source/ui/dlg/sdtreelb.cxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 275d39af4ea5..79d2300cb390 100755
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -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
@@ -58,7 +58,7 @@
#include <svtools/embedtransfer.hxx>
#include <tools/diagnose_ex.h>
#include <ViewShell.hxx>
-
+
using namespace com::sun::star;
class SdPageObjsTLB::IconProvider
@@ -87,8 +87,8 @@ public:
BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE;
BOOL SdPageObjsTLB::IsInDrag()
-{
- return bIsInDrag;
+{
+ return bIsInDrag;
}
sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32;
@@ -97,8 +97,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,
@@ -110,7 +110,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
meDragType( eDragType ),
maTreeListBoxData( rTreeListBoxData )
{
-}
+}
@@ -122,7 +122,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable()
// -----------------------------------------------------------------------------
void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
-{
+{
AddFormat(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK);
AddFormat(SOT_FORMATSTR_ID_TREELISTBOX);
AddFormat(GetListBoxDropFormatId());
@@ -240,19 +240,19 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
|*
\************************************************************************/
-SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
-: SvTreeListBox ( pParentWin, rSdResId )
-, mpParent ( pParentWin )
-, mpDoc ( NULL )
-, mpBookmarkDoc ( NULL )
-, mpMedium ( NULL )
-, 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 )
+SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
+: SvTreeListBox ( pParentWin, rSdResId )
+, mpParent ( pParentWin )
+, mpDoc ( NULL )
+, mpBookmarkDoc ( NULL )
+, mpMedium ( NULL )
+, 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 )
, mbShowAllPages ( false )
@@ -403,7 +403,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages,
mbShowAllPages = (bAllPages == TRUE);
mpMedium = NULL;
- SdPage* pPage = NULL;
+ SdPage* pPage = NULL;
IconProvider aIconProvider;
@@ -633,10 +633,10 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
if( !mpDoc )
return( FALSE );
- SdrObject* pObj = NULL;
- SdPage* pPage = NULL;
+ SdrObject* pObj = NULL;
+ SdPage* pPage = NULL;
SvLBoxEntry* pEntry = First();
- String aName;
+ String aName;
// Alle Pages incl. Objekte vergleichen
USHORT nPage = 0;
@@ -709,7 +709,7 @@ String SdPageObjsTLB::GetSelectEntry()
List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth )
{
- List* pList = NULL;
+ List* pList = NULL;
SvLBoxEntry* pEntry = FirstSelected();
while( pEntry )
@@ -741,8 +741,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
{
if( GetBookmarkDoc() )
{
- SdrObject* pObj = NULL;
- SdPage* pPage = NULL;
+ SdrObject* pObj = NULL;
+ SdPage* pPage = NULL;
SvLBoxEntry* pPageEntry = NULL;
Image aImgPage=Image( BitmapEx( SdResId( BMP_PAGE ) ) );
@@ -824,8 +824,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
/*************************************************************************
|*
-|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des
-|* uebergebenen Docs das BookmarkDoc
+|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des
+|* uebergebenen Docs das BookmarkDoc
|*
\************************************************************************/
@@ -976,10 +976,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() ) );
@@ -1038,16 +1038,16 @@ void SdPageObjsTLB::DoDrag()
{
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
String aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE );
- NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
+ NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
aURL.Append( '#' );
aURL.Append( GetSelectEntry() );
- INetBookmark aBookmark( aURL, GetSelectEntry() );
- sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
+ INetBookmark aBookmark( aURL, GetSelectEntry() );
+ sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
if( eDragType == NAVIGATOR_DRAGTYPE_LINK )
- nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both!
+ nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both!
SvTreeListBox::ReleaseMouse();
@@ -1061,7 +1061,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);
@@ -1142,7 +1142,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;
@@ -1171,11 +1171,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,16 +1194,16 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
if( !bIsInDrag )
{
SdNavigatorWin* pNavWin = NULL;
- USHORT nId = SID_NAVIGATOR;
-
+ 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;
-
+ TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable );
+ String aFile;
+
if( aDataHelper.GetString( FORMAT_FILE, aFile ) &&
( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) )
{
@@ -1232,8 +1232,8 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
IMPL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*, EMPTYARG)
{
- // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der
- // Navigator geloescht werden darf
+ // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der
+ // Navigator geloescht werden darf
pThis->DoDrag();
return 0;
}
@@ -1336,7 +1336,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)
{
@@ -1360,7 +1360,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());
}
@@ -1374,7 +1374,7 @@ bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry)
{
if (pEntry == NULL)
return false;
-
+
if ( ! IsDropFormatSupported(SdPageObjsTransferable::GetListBoxDropFormatId()))
return false;
@@ -1426,7 +1426,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
Point aDragPos (rObject.GetCurrentBoundRect().Center());
//Point aDragPos (0,0);
aObjectDescriptor.maDragStartPos = aDragPos;
- // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize();
+ // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize();
if (pDocShell != NULL)
aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass();
else