[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source sfx2/source sw/source
sd/source/core/drawdoc3.cxx| 159 +++--
sfx2/source/sidebar/Accessible.hxx |1
sw/source/ui/docvw/edtwin.cxx | 34 ++-
3 files changed, 146 insertions(+), 48 deletions(-)
New commits:
commit 7d2515d9ac497b3aaf47ae3ce79ec79bc6880330
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Fri May 31 14:03:01 2013 +
122262: correct handling of Shift-arrow key for bigger steps movement of
objects in order to get back text selection via keys in a table
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f1077ce..c577b21 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1626,17 +1626,15 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
switch( rKeyCode.GetModifier() | rKeyCode.GetCode() )
{
case KEY_RIGHT | KEY_MOD2:
-case KEY_RIGHT | KEY_SHIFT:
eKeyState = KS_ColRightBig;
eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier() KEY_SHIFT ?
MOVE_RIGHT_HUGE : MOVE_RIGHT_SMALL;
+nDir = MOVE_RIGHT_SMALL;
goto KEYINPUT_CHECKTABLE;
case KEY_LEFT | KEY_MOD2:
-case KEY_LEFT | KEY_SHIFT:
eKeyState = KS_ColRightSmall;
eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier() KEY_SHIFT ? MOVE_LEFT_HUGE
: MOVE_LEFT_SMALL;
+nDir = MOVE_LEFT_SMALL;
goto KEYINPUT_CHECKTABLE;
case KEY_RIGHT | KEY_MOD2 | KEY_SHIFT:
@@ -1664,17 +1662,15 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
goto KEYINPUT_CHECKTABLE;
case KEY_UP | KEY_MOD2:
-case KEY_UP | KEY_SHIFT:
eKeyState = KS_ColBottomSmall;
eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier() KEY_SHIFT ? MOVE_UP_HUGE :
MOVE_UP_SMALL;
+nDir = MOVE_UP_SMALL;
goto KEYINPUT_CHECKTABLE;
case KEY_DOWN | KEY_MOD2:
-case KEY_DOWN | KEY_SHIFT:
eKeyState = KS_ColBottomBig;
eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier() KEY_SHIFT ? MOVE_DOWN_HUGE
: MOVE_DOWN_SMALL;
+nDir = MOVE_DOWN_SMALL;
goto KEYINPUT_CHECKTABLE;
// case KEY_UP | KEY_MOD2 | KEY_SHIFT:
@@ -1718,6 +1714,28 @@ KEYINPUT_CHECKTABLE:
}
break;
+// huge object move
+case KEY_RIGHT | KEY_SHIFT:
+case KEY_LEFT | KEY_SHIFT:
+case KEY_UP | KEY_SHIFT:
+case KEY_DOWN | KEY_SHIFT:
+{
+if ( pFlyFmt
+ || ( (rSh.GetSelectionType()
(nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM))
+ rSh.GetDrawView()-AreObjectsMarked() ) )
+{
+eKeyState = pFlyFmt ? KS_Fly_Change : KS_Draw_Change;
+switch ( rKeyCode.GetCode() )
+{
+case KEY_RIGHT: nDir = MOVE_RIGHT_HUGE; break;
+case KEY_LEFT: nDir = MOVE_LEFT_HUGE; break;
+case KEY_UP: nDir = MOVE_UP_HUGE; break;
+case KEY_DOWN: nDir = MOVE_DOWN_HUGE; break;
+}
+}
+break;
+}
+
//---
// Insert/Delete
case KEY_LEFT:
commit 2136f4599bdc6f44bc0cc551189bfa565d3fbe71
Author: Armin Le Grand a...@apache.org
Date: Fri May 31 12:50:30 2013 +
i121863 Corrected DD from MasterPage view, source SlideSorter, target 2nd
DocumentView
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d30abdd..ee6e698 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1512,6 +1512,58 @@ void
SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
|* Ist rLayoutName leer, so wird die erste MasterPage genommen
\/
+// #121863# factored out functionality
+bool isMasterPageLayoutNameUnique(const SdDrawDocument rDoc, const String
rCandidate)
+{
+if(!rCandidate.Len())
+{
+return false;
+}
+
+const sal_uInt16 nPageCount(rDoc.GetMasterPageCount());
+
+for(sal_uInt16 a(0); a nPageCount; a++)
+{
+const SdrPage* pCandidate = rDoc.GetMasterPage(a);
+String aPageLayoutName(pCandidate-GetLayoutName());
+aPageLayoutName.Erase(aPageLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+if(aPageLayoutName == rCandidate)
+{
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source sfx2/source
sd/source/ui/sidebar/LayoutMenu.cxx |1
sd/source/ui/view/drviews1.cxx |3 +
sd/source/ui/view/drviewsa.cxx |2
sfx2/source/sidebar/SidebarController.cxx| 63 +--
sfx2/source/sidebar/SidebarController.hxx|6 --
sfx2/source/sidebar/SidebarDockingWindow.cxx |2
sfx2/source/sidebar/TabBar.cxx | 26 ---
sfx2/source/sidebar/TabBar.hxx | 13 -
8 files changed, 60 insertions(+), 56 deletions(-)
New commits:
commit d8b17867f3c58d5623cca129d6459bae0eb11729
Author: Andre Fischer a...@apache.org
Date: Tue May 21 09:46:08 2013 +
i122336: Show docked tab bar after closing undocked sidebar.
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1b6dcd8..b6b56a1 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -98,8 +98,8 @@ sal_Bool SidebarDockingWindow::Close (void)
{
// Do not close the floating window.
// Dock it and close just the deck instead.
-mpSidebarController-RequestCloseDeck();
SetFloatingMode(sal_False);
+mpSidebarController-RequestCloseDeck();
mpSidebarController-NotifyResize();
return sal_False;
}
commit b89784c822670593cb253bcc0d260b93c9936e1c
Author: Andre Fischer a...@apache.org
Date: Tue May 21 09:22:27 2013 +
i122291: Showing the right set of layouts for handout mode. Fixed painting
selection in layout panel.
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index dd26a07..2aac13f 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -816,6 +816,7 @@ void LayoutMenu::UpdateSelection (void)
break;
// Find the entry of the menu for to the layout.
+SetNoSelection();
sal_uInt16 nItemCount (GetItemCount());
for (sal_uInt16 nId=1; nId=nItemCount; nId++)
{
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 615063f..4bc9851 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -519,6 +519,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
if (meEditMode == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1410116..8cb2297 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -158,6 +158,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame,
ViewShellBase rViewShellBas
if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else if (mePageKind == PK_HANDOUT)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}
commit b27563ac5988d7ce407b045466e952114f54e07c
Author: Andre Fischer a...@apache.org
Date: Tue May 21 08:49:40 2013 +
i122352: Do not allow selection of disabled decks via menu.
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index a6a4d73..0078418 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -110,7 +110,7 @@ SidebarController::SidebarController (
mpParentWindow,
rxFrame,
::boost::bind(SidebarController::OpenThenSwitchToDeck, this,
_1),
- ::boost::bind(SidebarController::ShowPopupMenu, this,
_1,_2,_3))),
+ ::boost::bind(SidebarController::ShowPopupMenu, this, _1,_2))),
mxFrame(rxFrame),
maCurrentContext(OUString(), OUString()),
maRequestedContext(),
@@ -802,10 +802,9 @@ IMPL_LINK(SidebarController, WindowEventHandler,
VclWindowEvent*, pEvent)
void SidebarController::ShowPopupMenu (
const Rectangle rButtonBox,
-const ::std::vectorTabBar::DeckMenuData rDeckSelectionData,
-const ::std::vectorTabBar::DeckMenuData rDeckShowData) const
+const ::std::vectorTabBar::DeckMenuData rMenuData) const
{
-::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rDeckSelectionData,
rDeckShowData);
+::boost::shared_ptrPopupMenu pMenu = CreatePopupMenu(rMenuData);
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sd/source sfx2/source svx/inc svx/source
sd/source/ui/view/drviewsa.cxx|8 ++--
sfx2/source/sidebar/DeckTitleBar.cxx | 15 +--
sfx2/source/sidebar/FocusManager.cxx |6 +++---
sfx2/source/sidebar/PanelTitleBar.cxx |5 +
sfx2/source/sidebar/Sidebar.hrc |3 +++
sfx2/source/sidebar/Sidebar.src |9 +
svx/inc/svx/sidebar/SelectionAnalyzer.hxx |5 +
svx/source/sidebar/SelectionAnalyzer.cxx | 12 ++--
8 files changed, 46 insertions(+), 17 deletions(-)
New commits:
commit d22d2bb3621602a4e2154123976423365d54f552
Author: Pavel JanÃk pavelja...@apache.org
Date: Mon May 13 15:50:20 2013 +
Retype values properly to prevent compiler warnings.
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 13f6e37..b1e6dd0 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -282,7 +282,7 @@ bool FocusManager::IsDeckTitleVisible (void) const
void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
{
-if (nPanelIndex0 || nPanelIndex=maPanels.size())
+if (nPanelIndex0 || nPanelIndex=static_castsal_Int32(maPanels.size()))
return;
Panel rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
@@ -496,7 +496,7 @@ void FocusManager::HandleKeyEvent (
case PC_PanelToolBox:
case PC_PanelContent:
// Go to next panel.
-if (aLocation.mnIndex maPanels.size()-1)
+if (aLocation.mnIndex
static_castsal_Int32(maPanels.size())-1)
FocusPanel(aLocation.mnIndex+1);
else
FocusButton(0);
@@ -510,7 +510,7 @@ void FocusManager::HandleKeyEvent (
case PC_TabBar:
// Go to next tab bar item.
-if (aLocation.mnIndex maButtons.size()-1)
+if (aLocation.mnIndex
static_castsal_Int32(maButtons.size())-1)
FocusButton(aLocation.mnIndex + 1);
else if (IsDeckTitleVisible())
FocusDeckTitle();
commit a97c4ca2c235a4654243cbbdf970800454b5aa56
Author: Andre Fischer a...@apache.org
Date: Mon May 13 15:25:51 2013 +
121981: Don't change sidebar context while in Impress table.
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 211907c..1410116 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -871,14 +871,10 @@ void DrawViewShell::GetAnnotationState (SfxItemSet
rItemSet )
}
+
+
EnumContext::Context DrawViewShell::GetContextForSelection (void) const
{
-if (mpDrawView-GetMarkedObjectList().GetMarkCount() == 1)
-if (mpDrawView-GetTextEditObject() != NULL)
-if (mpDrawView-GetTextEditOutlinerView() != NULL)
-return EnumContext::Context_DrawText;
-
-// All other cases are handled by the SelectionAnalyzer.
return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SD(
mpDrawView-GetMarkedObjectList(),
meEditMode == EM_MASTERPAGE,
diff --git a/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
b/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
index 3f4fa14..0702a0a 100644
--- a/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
+++ b/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
@@ -31,6 +31,11 @@ class SdrObject;
namespace svx { namespace sidebar {
+/** Analyze the current selection of Calc or Draw/Impress documents
+and return the associated sidebar context.
+
+The decision is based on heuristics. Do not expect pretty code.
+*/
class SVX_DLLPUBLIC SelectionAnalyzer
{
public :
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx
b/svx/source/sidebar/SelectionAnalyzer.cxx
index 233ba37..52e1b9f 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -122,9 +122,17 @@ EnumContext::Context
SelectionAnalyzer::GetContextForSelection_SD (
case 1:
{
SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj-ISA(SdrTextObj) ((SdrTextObj*)pObj)-IsInEditMode() )
+if (pObj-ISA(SdrTextObj) ((SdrTextObj*)pObj)-IsInEditMode())
{
-eContext = EnumContext::Context_DrawText;
+if (pObj-GetObjIdentifier() == OBJ_TABLE)
+{
+// Let a table object take precedence over text
+// edit mode. The panels for text editing are
+// present for table context as well, anyway.
+eContext = EnumContext::Context_Table;
+}
+else
+eContext = EnumContext::Context_DrawText;
}
else
{
commit 2f18055a153f4e66ec72b0c20673032d6edeebab
Author: Andre Fischer a...@apache.org
Date: Mon May 13 14:41:07
