CWS-TOOLING: integrate CWS impress171

2009-06-02 16:32:02 +0200 cl  r272511 : fixed build error
2009-05-29 16:40:09 +0200 cl  r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49)
2009-05-19 15:14:08 +0200 sj  r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given)
2009-05-19 15:09:31 +0200 sj  r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given)
2009-05-19 15:09:14 +0200 sj  r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given)
2009-05-18 13:34:05 +0200 sj  r272015 : #i47689# fixed rectangles toolbar
2009-05-13 14:59:08 +0200 sj  r271862 : #i101563# fixed crash when loading pptx document
2009-05-12 19:31:58 +0200 sj  r271835 : #101684# fixed rotation of customshapes
2009-05-08 16:37:01 +0200 sj  r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem
2009-04-28 17:32:14 +0200 sj  r271335 : #i48160# fixed gluepoint rotation of customshapes
2009-04-27 16:31:54 +0200 cl  r271291 : #i100138# applied patch for japanese reconversion feature
2009-04-27 16:30:52 +0200 cl  r271290 : #i100138# applied patch for japanese reconversion feature
2009-04-27 16:28:55 +0200 cl  r271289 : #i100138# applied patch for japanese reconversion feature
2009-04-23 14:22:59 +0200 cl  r271170 : #i95342# #i96820# #i97298# multiple table handling fixes
2009-04-23 14:18:54 +0200 sj  r271169 : #i60368# ignoring gamma values for toolbar/menu icons
2009-04-23 11:54:28 +0200 cl  r271146 : #i97298# set style to text even during text edit
2009-04-23 11:46:38 +0200 cl  r271145 : fixed compiler error with debug
2009-04-22 19:09:37 +0200 sj  r271135 : #i101051# applied patch (proper import of notes page object)
2009-04-22 11:07:54 +0200 cl  r271082 : #i96820# modify doc after merging cells
2009-04-22 10:57:35 +0200 cl  r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state
2009-04-22 10:31:11 +0200 cl  r271079 : #i96736# copy merge information on clone
2009-04-21 08:27:22 +0200 cl  r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal
2009-04-20 17:52:56 +0200 cl  r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles
2009-04-20 16:41:55 +0200 cl  r270994 : #i98403# fixed state handling for selected motion path
2009-04-17 11:35:25 +0200 cl  r270931 : #i61274# export to pdf should behave like printing considering layer visibility
2009-04-17 10:00:17 +0200 cl  r270924 : #i98967# set default style on any new shape except a page obj
2009-04-16 16:28:20 +0200 cl  r270893 : #i98859# use percentage type for relative font height

1 files changed, 37 insertions, 0 deletions

diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 434e55483c53..e3c3ab3a7e95 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -37,6 +37,9 @@
 
 #include <sfx2/viewfrm.hxx>
 
+#include <svx/outliner.hxx>

+ 

+#include <svx/editview.hxx>
 
 #include "app.hrc"
 #include "helpids.h"
@@ -1206,4 +1209,38 @@ void Window::DropScroll(const Point& rMousePos)
     }
 }
 
+XubString Window::GetSurroundingText() const

+{

+    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )

+    {

+        return XubString();

+    }

+    else if ( mpViewShell->GetView()->IsTextEdit() )

+    {

+        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();

+        return pOLV->GetEditView().GetSurroundingText();

+    }

+    else

+    {

+        return XubString();

+    }

+}

+

+Selection Window::GetSurroundingTextSelection() const

+{

+    if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )

+    {

+        return Selection( 0, 0 );

+    }

+    else if ( mpViewShell->GetView()->IsTextEdit() )

+    {

+        OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();

+        return pOLV->GetEditView().GetSurroundingTextSelection();

+    }

+    else

+    {

+        return Selection( 0, 0 );

+    }

+}

+
 } // end of namespace sd