[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig
sc/sdi/tabvwsh.sdi|1 + sc/source/ui/view/tabvwsh3.cxx| 34 +- sc/uiconfig/scalc/menubar/menubar.xml |1 + 3 files changed, 35 insertions(+), 1 deletion(-) New commits: commit 7f46e701f25e8eef1572e94d092170e0d793dc87 Author: Tomaž Vajngerl AuthorDate: Fri May 5 23:10:14 2023 +0900 Commit: Tomaž Vajngerl CommitDate: Thu May 11 18:09:14 2023 +0200 sc: add ThemeDialog to the main menu Change-Id: I677aac5fdc8f493dcd8190c12e4e44ba09d3eb9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151450 Tested-by: Tomaž Vajngerl Reviewed-by: Tomaž Vajngerl diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index b10d42bdb7f3..e1da8b2f5d14 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -184,6 +184,7 @@ interface TableEditView SID_JUMPTOMARK [ ExecMethod = Execute; StateMethod = NoState; ] // status(final|play) SID_PRINTPREVIEW[ ExecMethod = Execute; StateMethod = GetState; ] +SID_THEME_DIALOG[ ExecMethod = Execute; StateMethod = GetState; ] // search/replace diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 5c41a4e49b75..da061b14e57b 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -59,6 +59,11 @@ #include +#include +#include +#include +#include + namespace { void collectUIInformation(const OUString& aZoom) @@ -1335,7 +1340,34 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SelectionChanged(); } break; - +case SID_THEME_DIALOG: +{ +MakeDrawLayer(); +ScTabView* pTabView = GetViewData().GetView(); +ScDrawView* pView = pTabView->GetScDrawView(); +SdrPage* pPage = pView->GetSdrPageView()->GetPage(); +auto const& pTheme = pPage->getSdrPageProperties().GetTheme(); +if (pTheme) +{ +ScViewData& rViewData = GetViewData(); +vcl::Window* pWin = rViewData.GetActiveWin(); +auto pDialog = std::make_shared(pWin ? pWin->GetFrameWeld() : nullptr, pTheme.get()); +weld::DialogController::runAsync(pDialog, [pDialog, pPage](sal_uInt32 nResult) { +if (RET_OK != nResult) +return; + +auto oColorSet = pDialog->getCurrentColorSet(); +if (oColorSet) +{ +auto& rColorSet = (*oColorSet).get(); +svx::ThemeColorChanger aChanger(pPage); +aChanger.apply(rColorSet); +} +}); +} +rReq.Done(); +} +break; case SID_OPT_LOCALE_CHANGED : { // locale changed, SYSTEM number formats changed => repaint cell contents PaintGrid(); diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 7b51b4b8d816..413e2e5ce11c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -421,6 +421,7 @@ +
[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig
sc/sdi/drtxtob.sdi |1 + sc/sdi/editsh.sdi|1 + sc/source/ui/drawfunc/drtxtob.cxx| 15 +++ sc/source/ui/view/editsh.cxx | 13 + sc/uiconfig/scalc/popupmenu/celledit.xml |1 + sc/uiconfig/scalc/popupmenu/drawtext.xml |1 + 6 files changed, 32 insertions(+) New commits: commit a8b400ee8f9a7c80905afe147b7c9b991c6742cd Author: Samuel Mehrbrodt AuthorDate: Tue Aug 6 12:27:03 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Tue Aug 6 13:33:49 2019 +0200 Add "Copy hyperlink location" to sc context menus Change-Id: I93840c7a7e6a0c5dedb6fa460a46d1785e80 Reviewed-on: https://gerrit.libreoffice.org/77018 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index 89be1b24c3ee..bbc68728c947 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -131,6 +131,7 @@ interface TableDrawText SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] SID_OPEN_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_EDIT_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] +SID_COPY_HYPERLINK_LOCATION [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_REMOVE_HYPERLINK[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 5718fc63407e..934e6e8a6535 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -80,6 +80,7 @@ interface TableText SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ] SID_OPEN_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_EDIT_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] +SID_COPY_HYPERLINK_LOCATION [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_REMOVE_HYPERLINK [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_SENTENCE_CASE [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 58943add8cbd..334f1933a88b 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -58,6 +58,7 @@ #include #include +#include #include #include @@ -310,6 +311,18 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) } break; +case SID_COPY_HYPERLINK_LOCATION: +{ +const SvxFieldData* pField = pOutView->GetFieldAtCursor(); +if (const SvxURLField* pURLField = dynamic_cast(pField)) +{ +uno::Reference xClipboard += pOutView->GetWindow()->GetClipboard(); + vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard); +} +} +break; + case SID_REMOVE_HYPERLINK: { URLFieldHelper::RemoveURLField(pOutliner, pOutView); @@ -393,6 +406,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) if (rSet.GetItemState(SID_OPEN_HYPERLINK) != SfxItemState::UNKNOWN || rSet.GetItemState(SID_EDIT_HYPERLINK) != SfxItemState::UNKNOWN +|| rSet.GetItemState(SID_COPY_HYPERLINK_LOCATION) != SfxItemState::UNKNOWN || rSet.GetItemState(SID_REMOVE_HYPERLINK) != SfxItemState::UNKNOWN) { SdrView* pView = pViewData->GetScDrawView(); @@ -401,6 +415,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) { rSet.DisableItem( SID_OPEN_HYPERLINK ); rSet.DisableItem( SID_EDIT_HYPERLINK ); +rSet.DisableItem( SID_COPY_HYPERLINK_LOCATION ); rSet.DisableItem( SID_REMOVE_HYPERLINK ); } } diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 7140f7499c06..3d8cf4c88312 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -636,6 +637,17 @@ void ScEditShell::Execute( SfxRequest& rReq ) SID_HYPERLINK_DIALOG); } break; +case SID_COPY_HYPERLINK_LOCATION: +{ +const SvxFieldData* pField = pEditView->GetFieldAtCursor(); +if (const SvxURLField* pURLField = dynamic_cast(pField)) +{ +uno::Reference xClipboard += pEditView->GetWindow()->GetClipboard(); + vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard); +} +} +break;
[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig
sc/sdi/tabvwsh.sdi |1 + sc/source/ui/drawfunc/fuconrec.cxx |2 ++ sc/source/ui/drawfunc/fupoor.cxx|4 +++- sc/source/ui/view/tabvwsh2.cxx |2 ++ sc/uiconfig/scalc/toolbar/arrowsbar.xml |1 + 5 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 19dc5d725791388f1b7b17af2e48b0abdf8990bd Author: Gulsah Kose Date: Thu Oct 13 15:17:25 2016 +0300 tdf#101390 Add "Diagonal Line" command to the calc arrowsbar. Change-Id: I1e29cd9a63424771576d1a5a47558d30faf53dda Signed-off-by: Gulsah Kose Reviewed-on: https://gerrit.libreoffice.org/29769 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index f7da47f..ec44746 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -88,6 +88,7 @@ interface BaseSelection SID_OBJECT_SELECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAW_LINE [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] +SID_DRAW_XLINE [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_LINE_ARROW_END [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_LINE_ARROW_CIRCLE [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_LINE_ARROW_SQUARE [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index ebc2611..d76b1ef 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -196,6 +196,7 @@ void FuConstRectangle::Activate() switch (aSfxRequest.GetSlot() ) { case SID_DRAW_LINE: +case SID_DRAW_XLINE: case SID_LINE_ARROW_END: case SID_LINE_ARROW_CIRCLE: case SID_LINE_ARROW_SQUARE: @@ -403,6 +404,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec switch(nID) { case SID_DRAW_LINE: +case SID_DRAW_XLINE: case SID_LINE_ARROW_END: case SID_LINE_ARROW_CIRCLE: case SID_LINE_ARROW_SQUARE: diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 94829ea..03a6646 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -308,7 +308,9 @@ bool FuPoor::doConstructOrthogonal() const return bIsMediaSelected; } } -else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON || aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL) +else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON + || aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL + || aSfxRequest.GetSlot() == SID_DRAW_XLINE) return true; return false; diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 13c32a8..a3982db 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -218,6 +218,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) break; case SID_DRAW_LINE: +case SID_DRAW_XLINE: case SID_LINE_ARROW_END: case SID_LINE_ARROW_CIRCLE: case SID_LINE_ARROW_SQUARE: @@ -369,6 +370,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) break; case SID_DRAW_LINE: +case SID_DRAW_XLINE: case SID_LINE_ARROW_END: case SID_LINE_ARROW_CIRCLE: case SID_LINE_ARROW_SQUARE: diff --git a/sc/uiconfig/scalc/toolbar/arrowsbar.xml b/sc/uiconfig/scalc/toolbar/arrowsbar.xml index cfe177a..40d7238 100644 --- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml +++ b/sc/uiconfig/scalc/toolbar/arrowsbar.xml @@ -29,4 +29,5 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig
sc/sdi/tabvwsh.sdi |1 + sc/source/ui/drawfunc/fuconrec.cxx | 19 +++ sc/source/ui/view/tabvwsh2.cxx |2 ++ sc/uiconfig/scalc/toolbar/arrowsbar.xml |2 ++ 4 files changed, 24 insertions(+) New commits: commit 042a7fc229c44fcb7a0c009a1b7f5d34913f8c12 Author: Gulsah Kose Date: Tue Oct 11 23:50:47 2016 +0300 tdf#101390 Add "Dimesion Line" command to the calc arrowsbox. Change-Id: I00a324dd0a27dbcf598e83d2a6cc857ab7b7d6aa Signed-off-by: Gulsah Kose Reviewed-on: https://gerrit.libreoffice.org/29716 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 91e92c9..f7da47f 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -95,6 +95,7 @@ interface BaseSelection SID_LINE_CIRCLE_ARROW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_LINE_SQUARE_ARROW [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_LINE_ARROWS [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] +SID_DRAW_MEASURELINE[ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAWTBX_ARROWS [ StateMethod = GetDrawState; ] SID_DRAW_RECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAW_ELLIPSE[ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 310b114..ebc2611 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -206,6 +207,11 @@ void FuConstRectangle::Activate() aObjKind = OBJ_LINE; break; +case SID_DRAW_MEASURELINE: +aNewPointer = Pointer( PointerStyle::DrawLine ); +aObjKind = OBJ_MEASURE; +break; + case SID_DRAW_RECT: aNewPointer = Pointer( PointerStyle::DrawRect ); aObjKind = OBJ_RECT; @@ -420,6 +426,19 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec break; } + +case SID_DRAW_MEASURELINE: +{ +if(dynamic_cast( pObj) != nullptr) +{ +sal_Int32 nYMiddle((aRect.Top() + aRect.Bottom()) / 2); + static_cast(pObj)->SetPoint(Point(aStart.X(), nYMiddle), 0); + static_cast(pObj)->SetPoint(Point(aEnd.X(), nYMiddle), 1); +} + +break; +} + case SID_DRAW_CAPTION: case SID_DRAW_CAPTION_VERTICAL: { diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index f1a0f48..13c32a8 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -227,6 +227,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_LINE_ARROWS: case SID_DRAW_RECT: case SID_DRAW_ELLIPSE: +case SID_DRAW_MEASURELINE: pTabView->SetDrawFuncPtr(new FuConstRectangle(this, pWin, pView, pDoc, rReq)); break; @@ -375,6 +376,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) case SID_LINE_CIRCLE_ARROW: case SID_LINE_SQUARE_ARROW: case SID_LINE_ARROWS: +case SID_DRAW_MEASURELINE: case SID_DRAW_RECT: case SID_DRAW_ELLIPSE: case SID_DRAW_POLYGON: diff --git a/sc/uiconfig/scalc/toolbar/arrowsbar.xml b/sc/uiconfig/scalc/toolbar/arrowsbar.xml index 5ec4d8a..cfe177a 100644 --- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml +++ b/sc/uiconfig/scalc/toolbar/arrowsbar.xml @@ -27,4 +27,6 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/sdi sd/source sd/uiconfig sd/UIConfig_simpress.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/source
sc/UIConfig_scalc.mk |1 sc/sdi/docsh.sdi |1 sc/source/ui/docshell/docsh4.cxx | 14 ++ sc/uiconfig/scalc/ui/notebookbar.ui| 172 + sd/UIConfig_simpress.mk|1 sd/sdi/docshell.sdi|5 sd/source/ui/docshell/docshel3.cxx |7 + sd/source/ui/docshell/docshell.cxx |7 + sd/uiconfig/simpress/ui/notebookbar.ui | 118 ++ sfx2/UIConfig_sfx.mk |1 sfx2/source/dialog/backingcomp.cxx | 20 +++ sfx2/uiconfig/ui/notebookbar.ui| 118 ++ vcl/source/window/brdwin.cxx |2 13 files changed, 467 insertions(+) New commits: commit 6ebf9cfbf54052d7fae50cdab146cc5c63ba262a Author: Szymon KÅos Date: Tue May 10 19:16:47 2016 +0200 Set different ui file for NotebookBar in each app Changes: + added ui file for start center, calc and impress + NotebookBar not visible in Math, Draw Change-Id: Ie35935e67524ac712930b088591e9e53955de4a1 Reviewed-on: https://gerrit.libreoffice.org/24860 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index f67a879..21bb7e1 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/leftfooterdialog \ sc/uiconfig/scalc/ui/leftheaderdialog \ sc/uiconfig/scalc/ui/namerangesdialog \ + sc/uiconfig/scalc/ui/notebookbar \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/movecopysheet \ sc/uiconfig/scalc/ui/movingaveragedialog \ diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index 25852fb..852af49 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -87,6 +87,7 @@ interface TableDocument SID_EDIT_SCENARIO [ ExecMethod = Execute; ] SID_ATTR_CHAR_FONTLIST [ StateMethod = GetState; ] SID_SHARE_DOC [ ExecMethod = Execute; StateMethod = GetState; ] +SID_NOTEBOOKBAR [ ExecMethod = Execute; StateMethod = GetState; ] } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1bedf91..bdf1c52 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -101,6 +101,7 @@ using namespace ::com::sun::star; #include "formulacell.hxx" #include #include +#include void ScDocShell::Execute( SfxRequest& rReq ) { @@ -1103,6 +1104,12 @@ void ScDocShell::Execute( SfxRequest& rReq ) { &aApp, &aTarget }); } break; +case SID_NOTEBOOKBAR: +{ +if (pBindings) +sfx2::SfxNotebookBar::ExecMethod(*pBindings); +} +break; default: { // kleiner (?) Hack -> forward der Slots an TabViewShell @@ -1857,6 +1864,13 @@ void ScDocShell::GetState( SfxItemSet &rSet ) rSet.Put( SvxFontListItem( pImpl->pFontList, nWhich ) ); break; +case SID_NOTEBOOKBAR: +{ +if (GetViewBindings()) +sfx2::SfxNotebookBar::StateMethod(*GetViewBindings(), "modules/scalc/ui/notebookbar.ui"); +} +break; + default: { } diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui new file mode 100644 index 000..337448d --- /dev/null +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -0,0 +1,172 @@ + + + + + + +True +False + + +True +False +vertical + + +True +True +True +True + + +True +False +6 + + +True +False +vertical + + +True +True +True +.uno:Open +none + + +False +True +0 + + + + +True +True +True +.uno:Save +none + + +False +True +1 + + + + +False +True +0 + + +