diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-22 13:02:29 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-22 13:03:35 +0100 |
| commit | 26413a442c949dad3e4cb32261cfeb493ebe1842 (patch) | |
| tree | 23ebc117a3c195d56e9f009b465c2a24e0d4785c | |
| parent | 866dc86801bd7eda49a789b1c0ad95c08d24e282 (diff) | |
fdo#32380, n#649506: Fixed navigation buttons' patch selection handling
| -rw-r--r-- | patches/dev300/writer-navigation-buttons.diff | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff index b25325ffc..c39bbfe01 100644 --- a/patches/dev300/writer-navigation-buttons.diff +++ b/patches/dev300/writer-navigation-buttons.diff @@ -583,14 +583,6 @@ index 14b26c0..3adf7dd 100644 class Window; class OutputDevice; -@@ -84,6 +85,7 @@ namespace nsSelectionType - const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape - const SelectionType SEL_FONTWORK = 0x010000; // fontwork - const SelectionType SEL_POSTIT = 0x020000; //annotation -+ const SelectionType SEL_NAV = 0x040000; //navigation buttons - } - - @@ -474,6 +476,21 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)(); String GetSelDescr() const; @@ -874,16 +866,13 @@ index 0e3d55e..dabdefa 100644 #include <globdoc.hxx> #include <scroll.hxx> #include <globdoc.hxx> -@@ -335,6 +336,13 @@ void SwView::SelectShell() +@@ -335,6 +336,10 @@ void SwView::SelectShell() if ( !( nSelectionType & nsSelectionType::SEL_FOC_FRM_CTRL ) ) rDispatcher.Push( *pFormShell ); -+ if ( nSelectionType & nsSelectionType::SEL_NAV ) -+ { -+ eShellMode = SHELL_MODE_NAVIGATION; -+ pShell = new SwNavigationShell( *this ); -+ rDispatcher.Push( *pShell ); -+ } ++ eShellMode = SHELL_MODE_NAVIGATION; ++ pShell = new SwNavigationShell( *this ); ++ rDispatcher.Push( *pShell ); + if ( nSelectionType & nsSelectionType::SEL_OLE ) { @@ -1421,15 +1410,6 @@ index 9f0b753..465f178 100644 } } /*------------------------------------------------------------------------ -@@ -1540,6 +1542,8 @@ SelectionType SwWrtShell::GetSelectionType() const - return nsSelectionType::SEL_FRM; - } - -+ nCnt |= nsSelectionType::SEL_NAV; -+ - if ( IsCrsrInTbl() ) - nCnt |= nsSelectionType::SEL_TBL; - @@ -1628,7 +1632,14 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const String &rFmtName) return 0; } |