chart2/source/controller/inc/ChartController.hxx | 1 chart2/source/controller/main/ChartController.cxx | 8 + officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 6 + sot/workben/makefile.mk | 44 ---------- sot/workben/testsot.cxx | 46 ----------- svx/source/tbxctrls/tbcontrl.cxx | 1 6 files changed, 16 insertions(+), 90 deletions(-)
New commits: commit 2639eadce4c9ccead9112a6893b5e9e2e0fefd78 Author: Markus Mohrhard <[email protected]> Date: Tue Sep 15 01:44:47 2015 +0200 show the correct color in the custom color picker in chart sidebar Change-Id: I14b4f354ec48997f4656b82de14e87a684f1f752 diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6f35cff..3b65c48 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2706,6 +2706,7 @@ void SvxColorToolBoxControl::StateChanged( aColor = static_cast< const XFillColorItem* >(pState)->GetColorValue(); } m_xBtnUpdater->Update( aColor ); + mPaletteManager.SetLastColor(aColor); } } commit da7253df58f70b0db58f906a25750eb346b2270b Author: Markus Mohrhard <[email protected]> Date: Tue Sep 15 01:20:02 2015 +0200 add more "more options" buttons in chart sidebar Change-Id: Ic16d38a0d6cbfe7baeb14dfd5a20b1602606ad61 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index e72f4e7..6bac7d7 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1177,6 +1177,9 @@ <prop oor:name="DeckId" oor:type="xs:string"> <value>ChartDeck</value> </prop> + <prop oor:name="DefaultMenuCommand"> + <value>.uno:ChartProperties</value> + </prop> <prop oor:name="ContextList"> <value oor:separator=";"> Chart, Series, visible ; @@ -1246,6 +1249,9 @@ <prop oor:name="DeckId" oor:type="xs:string"> <value>ChartDeck</value> </prop> + <prop oor:name="DefaultMenuCommand"> + <value>.uno:ChartProperties</value> + </prop> <prop oor:name="ContextList"> <value oor:separator=";"> Chart, Axis, visible ; commit 4248e89e4be31a5cb1c9b0b98b50ee16024ff5d4 Author: Markus Mohrhard <[email protected]> Date: Tue Sep 15 01:18:17 2015 +0200 remove chart sidebar when leaving chart edit mode Change-Id: Ie6fc01b2a610fb861ddade996ebb8480be217085 diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 826deee..cdb23aa 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -524,6 +524,7 @@ private: bool m_bWaitingForMouseUp; bool m_bConnectingToView; + bool m_bDisposed; ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; std::unique_ptr< UndoGuard > m_pTextActionUndoGuard; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index b99858f..8683b94 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -113,6 +113,7 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const & m_bWaitingForDoubleClick(false), m_bWaitingForMouseUp(false), m_bConnectingToView(false), + m_bDisposed(false), m_xUndoManager( 0 ), m_aDispatchContainer( m_xCC, this ), m_eDrawMode( CHARTDRAW_SELECT ), @@ -299,6 +300,9 @@ bool ChartController::TheModelRef::is() const OUString ChartController::GetContextName() { + if (m_bDisposed) + return OUString(); + uno::Any aAny = getSelection(); if (!aAny.hasValue()) return OUString("Chart"); @@ -425,6 +429,8 @@ void SAL_CALL ChartController::attachFrame( sfx2::sidebar::SidebarController* pSidebar = dynamic_cast<sfx2::sidebar::SidebarController*>(xSidebar.get()); sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, this); pSidebar->updateModel(getModel()); + css::lang::EventObject aEvent; + mpSelectionChangeHandler->selectionChanged(aEvent); } if(m_xFrame.is()) //what happens, if we do have a Frame already?? @@ -791,6 +797,8 @@ void ChartController::impl_deleteDrawViewController() void SAL_CALL ChartController::dispose() throw(uno::RuntimeException, std::exception) { + m_bDisposed = true; + mpSelectionChangeHandler->selectionChanged(css::lang::EventObject()); mpSelectionChangeHandler->Disconnect(); if (getModel().is()) commit 1beb5017f1791f26e6404d6175ccc1c49887c48e Author: Markus Mohrhard <[email protected]> Date: Fri Sep 11 20:53:17 2015 +0200 remove old unused sot workben code Change-Id: I1c8ea4c7940ae0740109cc558083d93638913fbd diff --git a/sot/workben/makefile.mk b/sot/workben/makefile.mk deleted file mode 100644 index 918c34c..0000000 --- a/sot/workben/makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=sot -TARGET=workben -LIBTARGET=NO -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/testsot.obj - -APP1TARGET= testsot -APP1OBJS= $(OBJ)$/testsot.obj -APP1STDLIBS=$(SOTLIB) \ - $(TOOLSLIB) - -APP1DEF= $(MISC)$/$(APP1TARGET).def - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx deleted file mode 100644 index 9e7c146..0000000 --- a/sot/workben/testsot.cxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <sot/storage.hxx> - -/* - * main. - */ -int main (int argc, sal_Char **argv) -{ - tools::SvRef<SotStorage> xStor = new SotStorage( "c:\\temp\\65254.ppt" ); -/* - tools::SvRef<SotStorage> xStor = new SotStorage( "c:\\temp\\video.sdb" ); - tools::SvRef<SotStorage> xStor = new SotStorage( "c:\\temp\\video.sdb" ); - tools::SvRef<SotStorage> x2Stor = xStor->OpenSotStorage( "1117" ); - - tools::SvRef<SotStorageStream> xStm = x2Stor->OpenSotStream( "Genres", STREAM_STD_READWRITE | StreamMode::TRUNC); - //BYTE szData[100]; - //xStm->Write( szData, 100 ); - UINT32 nSize = xStm->GetSize(); - xStm->SetSize( 0 ); - nSize = xStm->GetSize(); - x2Stor->Commit(); - xStor->Commit(); -*/ - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
