[Libreoffice-commits] core.git: 9 commits - chart2/README chart2/source sc/inc sc/source sfx2/source svl/qa
Markus Mohrhard
markus.mohrhard at googlemail.com
Mon Jun 1 15:16:01 PDT 2015
chart2/README | 7
chart2/source/controller/main/ChartController.hxx | 150 +++++++++----------
sc/inc/ScPanelFactory.hxx | 71 ---------
sc/source/ui/sidebar/ScPanelFactory.hxx | 71 +++++++++
sc/source/ui/unoobj/appluno.cxx | 1
sfx2/source/sidebar/ResourceManager.cxx | 2
sfx2/source/view/viewfrm.cxx | 167 ++++------------------
svl/qa/unit/svl.cxx | 32 ++++
8 files changed, 220 insertions(+), 281 deletions(-)
New commits:
commit b8bd51de83cafe3e9f0f3850bb1b40330a2a6aa3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Jun 2 00:13:28 2015 +0200
the test works much better if you really use en_US as language
Change-Id: Ie936bfb6ae03a6a3abd8175938555aea99790959
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index edfd536..6f46ba51 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1022,7 +1022,7 @@ void Test::checkDateInput( SvNumberFormatter& rFormatter, const char* pTimezone,
void Test::testIsNumberFormat()
{
- LanguageType eLang = LANGUAGE_THAI;
+ LanguageType eLang = LANGUAGE_ENGLISH_US;
SvNumberFormatter aFormatter(m_xContext, eLang);
struct NumberFormatData
@@ -1033,16 +1033,16 @@ void Test::testIsNumberFormat()
{ "20.3", true },
{ "2", true },
{ "test", false },
- { "Jan1", false }
- // { "Jan1 2000", true },
- // { "Jan 1", true },
- // { "Jan 1 2000", true}
+ { "Jan1", false },
+ { "Jan1 2000", true },
+ { "Jan 1", true },
+ { "Jan 1 2000", true}
};
for (size_t i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
- sal_uInt32 nIndex;
- double nNumber;
+ sal_uInt32 nIndex = 0;
+ double nNumber = 0;
OUString aString = OUString::createFromAscii(aTests[i].pFormat);
bool bIsNumber = aFormatter.IsNumberFormat(aString, nIndex, nNumber);
CPPUNIT_ASSERT_EQUAL(aTests[i].bIsNumber, bIsNumber);
commit 12e30adf9daf337084aba2249218d3e56bfe4ea3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jun 1 18:51:45 2015 +0200
add initial IsNumberFormat test
Change-Id: Idfd51360bfe8d857838ee522b8a9d3d3de06952b
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index d3bf59b..edfd536 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -60,6 +60,7 @@ public:
void testFdo60915();
void testI116701();
void testDateInput();
+ void testIsNumberFormat();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testNumberFormat);
@@ -69,6 +70,7 @@ public:
CPPUNIT_TEST(testFdo60915);
CPPUNIT_TEST(testI116701);
CPPUNIT_TEST(testDateInput);
+ CPPUNIT_TEST(testIsNumberFormat);
CPPUNIT_TEST_SUITE_END();
private:
@@ -1018,6 +1020,36 @@ void Test::checkDateInput( SvNumberFormatter& rFormatter, const char* pTimezone,
CPPUNIT_ASSERT_EQUAL( aDate, aOutString);
}
+void Test::testIsNumberFormat()
+{
+ LanguageType eLang = LANGUAGE_THAI;
+ SvNumberFormatter aFormatter(m_xContext, eLang);
+
+ struct NumberFormatData
+ {
+ const char* pFormat;
+ bool bIsNumber;
+ } aTests[] = {
+ { "20.3", true },
+ { "2", true },
+ { "test", false },
+ { "Jan1", false }
+ // { "Jan1 2000", true },
+ // { "Jan 1", true },
+ // { "Jan 1 2000", true}
+ };
+
+ for (size_t i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
+ {
+ sal_uInt32 nIndex;
+ double nNumber;
+ OUString aString = OUString::createFromAscii(aTests[i].pFormat);
+ bool bIsNumber = aFormatter.IsNumberFormat(aString, nIndex, nNumber);
+ CPPUNIT_ASSERT_EQUAL(aTests[i].bIsNumber, bIsNumber);
+
+ }
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
commit 278e2b36d28ab3c78d285688c78996d92d92727f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jun 1 16:55:55 2015 +0200
remove empty lines and bring some sanity in comment positions
Change-Id: I82b5e3df6a0926291719f619f344c3cccbd196e6
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bddf110..4c27c32 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -171,7 +171,6 @@ namespace
}
}
-
static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue >& aInfo )
{
// TODO/LATER: In future the info should replace the direct hash completely
@@ -220,20 +219,16 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
return bResult;
}
-
void SfxViewFrame::SetDowning_Impl()
{
pImp->bIsDowning = true;
}
-
bool SfxViewFrame::IsDowning_Impl() const
{
return pImp->bIsDowning;
}
-
-
class SfxViewNotificatedFrameList_Impl :
public SfxListener, public SfxViewFrameArr_Impl
{
@@ -242,7 +237,6 @@ public:
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
};
-
void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
@@ -958,7 +952,6 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq )
rReq.Done();
}
-
void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
{
// Search for Undo-Manager
@@ -1013,7 +1006,6 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
rSet.DisableItem( SID_REPEAT );
}
-
void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
{
i_rViewShell.PopSubShells_Impl();
@@ -1036,9 +1028,6 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
}
-
-void SfxViewFrame::ReleaseObjectShell_Impl()
-
/* [Description]
This method empties the SfxViewFrame, i.e. takes the <SfxObjectShell>
@@ -1055,6 +1044,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
<SfxViewFrame::SetObjectShell(SfxObjectShell&)>
*/
+void SfxViewFrame::ReleaseObjectShell_Impl()
{
DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" );
@@ -1106,7 +1096,6 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
GetDispatcher()->SetDisableFlags( 0 );
}
-
bool SfxViewFrame::Close()
{
@@ -1129,8 +1118,6 @@ bool SfxViewFrame::Close()
return true;
}
-
-
void SfxViewFrame::DoActivate( bool bUI, SfxViewFrame* pOldFrame )
{
SfxGetpApp();
@@ -1151,7 +1138,6 @@ void SfxViewFrame::DoActivate( bool bUI, SfxViewFrame* pOldFrame )
}
}
-
void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
{
SfxGetpApp();
@@ -1171,7 +1157,6 @@ void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
}
}
-
void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
{
if( pSh && !nAdjustPosPixelLock )
@@ -1189,7 +1174,6 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
}
}
-
bool SfxViewFrame::SetBorderPixelImpl
(
const SfxViewShell* pVSh,
@@ -1232,7 +1216,6 @@ bool SfxViewFrame::SetBorderPixelImpl
return true;
}
-
const SvBorder& SfxViewFrame::GetBorderPixelImpl
(
const SfxViewShell* /*pSh*/
@@ -1242,7 +1225,6 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl
return pImp->aBorder;
}
-
void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if( IsDowning_Impl())
@@ -1443,19 +1425,17 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
rViewArr.push_back( this );
}
-SfxViewFrame::SfxViewFrame
-(
- SfxFrame& rFrame,
- SfxObjectShell* pObjShell
-)
-
/* [Description]
Constructor of SfxViewFrame for a <SfxObjectShell> from the Resource.
The 'nViewId' to the created <SfxViewShell> can be returned.
(default is the SfxViewShell-Subclass that was registered first).
*/
-
+SfxViewFrame::SfxViewFrame
+(
+ SfxFrame& rFrame,
+ SfxObjectShell* pObjShell
+)
: pImp( new SfxViewFrame_Impl( rFrame ) )
, pDispatcher(0)
, pBindings( new SfxBindings )
@@ -1472,7 +1452,6 @@ SfxViewFrame::SfxViewFrame
rFrame.CreateWorkWindow_Impl();
}
-
SfxViewFrame::~SfxViewFrame()
{
SetDowning_Impl();
@@ -1504,11 +1483,8 @@ SfxViewFrame::~SfxViewFrame()
delete pImp;
}
-
-void SfxViewFrame::KillDispatcher_Impl()
-
// Remove and delete the Dispatcher.
-
+void SfxViewFrame::KillDispatcher_Impl()
{
SfxModule* pModule = xObjSh.Is() ? xObjSh->GetModule() : 0;
@@ -1524,13 +1500,11 @@ void SfxViewFrame::KillDispatcher_Impl()
}
}
-
SfxViewFrame* SfxViewFrame::Current()
{
return SfxApplication::Get() ? SfxGetpApp()->Get_Impl()->pViewFrame : NULL;
}
-
// returns the first window of spec. type viewing the specified doc.
SfxViewFrame* SfxViewFrame::GetFirst
(
@@ -1554,7 +1528,6 @@ SfxViewFrame* SfxViewFrame::GetFirst
return 0;
}
-
// returns thenext window of spec. type viewing the specified doc.
SfxViewFrame* SfxViewFrame::GetNext
(
@@ -1584,14 +1557,12 @@ SfxViewFrame* SfxViewFrame::GetNext
return 0;
}
-
SfxProgress* SfxViewFrame::GetProgress() const
{
SfxObjectShell *pObjSh = GetObjectShell();
return pObjSh ? pObjSh->GetProgress() : 0;
}
-
void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
(
SfxViewShell* pSh,
@@ -1623,13 +1594,11 @@ SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const
}
void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
-
/* [Description]
Internal Method to set the current <SfxViewShell> Instance,
that is active int this SfxViewFrame at the moment.
*/
-
{
SfxShell::SetViewShell_Impl( pVSh );
@@ -1638,32 +1607,27 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
pImp->bResizeInToOut = false;
}
-
/* [Description]
The ParentViewFrame of the Containers ViewFrame in the internal InPlace
*/
-
//TODO/LATER: is it still necessary? is there a replacement for GetParentViewFrame_Impl?
SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const
{
return NULL;
}
-
void SfxViewFrame::ForceOuterResize_Impl(bool bOn)
{
if ( !pImp->bDontOverwriteResizeInToOut )
pImp->bResizeInToOut = !bOn;
}
-
bool SfxViewFrame::IsResizeInToOut_Impl() const
{
return pImp->bResizeInToOut;
}
-
void SfxViewFrame::GetDocNumber_Impl()
{
DBG_ASSERT( GetObjectShell(), "No Document!" );
@@ -1671,8 +1635,6 @@ void SfxViewFrame::GetDocNumber_Impl()
pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1;
}
-
-
void SfxViewFrame::Enable( bool bEnable )
{
if ( bEnable != pImp->bEnabled )
@@ -1711,16 +1673,13 @@ void SfxViewFrame::Enable( bool bEnable )
}
}
-
-void SfxViewFrame::Show()
-
/* [Description]
This method makes the Frame-Window visible and before transmitts the
window name. In addition, the document is held. In general one can never
show the window directly!
*/
-
+void SfxViewFrame::Show()
{
// First lock the objectShell so that UpdateTitle() is valid:
// IsVisible() == true (:#)
@@ -1814,15 +1773,11 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus )
}
}
-
-
void SfxViewFrame::SetQuietMode_Impl( bool bOn )
{
GetDispatcher()->SetQuietMode_Impl( bOn );
}
-
-
SfxObjectShell* SfxViewFrame::GetObjectShell()
{
return xObjSh;
@@ -1855,7 +1810,6 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
return pViewFrame;
}
-
SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
const sal_uInt16 i_nViewId, const bool i_bHidden )
{
@@ -1926,7 +1880,6 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell
return NULL;
}
-
SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId,
const bool i_bHidden )
@@ -1956,35 +1909,26 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
return pViewShell;
}
-
-
SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
{
return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true );
}
-
-
SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
{
return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false );
}
-
-
SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId )
{
return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false );
}
-
-
SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId )
{
return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false );
}
-
SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId )
{
SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false );
@@ -1998,8 +1942,6 @@ SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const Sf
);
}
-
-
SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, const SfxObjectShell* i_pDoc )
{
if ( !i_rController.is() )
@@ -2032,8 +1974,6 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
return pViewFrame;
}
-
-
void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
{
SfxViewShell* pCurrentShell = GetViewShell();
@@ -2098,24 +2038,6 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
}
}
-
-
-bool SfxViewFrame::SwitchToViewShell_Impl
-(
- sal_uInt16 nViewIdOrNo, /* > 0
- Registration-Id of the View, to which the
- the method should switch, for example the one
- that will be created.
-
- == 0
- First use the Default view. */
-
- bool bIsIndex /* true
- 'nViewIdOrNo' is no Registration-Id instead
- an Index of <SfxViewFrame> in <SfxObjectShell>.
- */
-)
-
/* [Description]
Internal Method for switching to another <SfxViewShell> subclass,
@@ -2133,7 +2055,21 @@ bool SfxViewFrame::SwitchToViewShell_Impl
SfxViewShell requested could not be created,
the existing SfxViewShell thus continue to exist
*/
+bool SfxViewFrame::SwitchToViewShell_Impl
+(
+ sal_uInt16 nViewIdOrNo, /* > 0
+ Registration-Id of the View, to which the
+ the method should switch, for example the one
+ that will be created.
+
+ == 0
+ First use the Default view. */
+ bool bIsIndex /* true
+ 'nViewIdOrNo' is no Registration-Id instead
+ an Index of <SfxViewFrame> in <SfxObjectShell>.
+ */
+)
{
try
{
@@ -2192,30 +2128,25 @@ bool SfxViewFrame::SwitchToViewShell_Impl
return true;
}
-
void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID )
{
pImp->nCurViewId = i_nID;
}
-
sal_uInt16 SfxViewFrame::GetCurViewId() const
{
return pImp->nCurViewId;
}
-
-void SfxViewFrame::ExecView_Impl
-(
- SfxRequest& rReq // The executable <SfxRequest>
-)
-
/* [Description]
Internal method to run the slot for the <SfxShell> Subclass in the
SfxViewFrame <SVIDL> described slots.
*/
-
+void SfxViewFrame::ExecView_Impl
+(
+ SfxRequest& rReq // The executable <SfxRequest>
+)
{
// If the Shells are just being replaced...
@@ -2305,7 +2236,6 @@ void SfxViewFrame::ExecView_Impl
}
}
-
/* TODO as96863:
This method try to collect information about the count of currently open documents.
But the algorithm is implemented very simple ...
@@ -2355,13 +2285,6 @@ bool impl_maxOpenDocCountReached()
return (nOpenDocs >= nMaxDocs);
}
-
-void SfxViewFrame::StateView_Impl
-(
- SfxItemSet& rSet /* empty <SfxItemSet> with <Which-Ranges>,
- which describes the Slot Ids */
-)
-
/* [Description]
This internal methode returns in 'rSet' the Status for the <SfxShell>
@@ -2373,7 +2296,11 @@ void SfxViewFrame::StateView_Impl
Which-IDs are used so that items can be replaced directly with a working
Core::sun::com::star::script::Engine of the Which-IDs if possible. .
*/
-
+void SfxViewFrame::StateView_Impl
+(
+ SfxItemSet& rSet /* empty <SfxItemSet> with <Which-Ranges>,
+ which describes the Slot Ids */
+)
{
SfxObjectShell *pDocSh = GetObjectShell();
@@ -2436,27 +2363,25 @@ void SfxViewFrame::ToTop()
}
-SfxViewFrame* SfxViewFrame::GetParentViewFrame() const
/* [Description]
The ParentViewFrame is the ViewFrame of the ParentFrames.
*/
+SfxViewFrame* SfxViewFrame::GetParentViewFrame() const
{
SfxFrame *pFrame = GetFrame().GetParentFrame();
return pFrame ? pFrame->GetCurrentViewFrame() : NULL;
}
-
-SfxFrame& SfxViewFrame::GetFrame() const
/* [Description]
GetFrame returns the Frame, in which the ViewFrame is located.
*/
+SfxFrame& SfxViewFrame::GetFrame() const
{
return pImp->rFrame;
}
-
SfxViewFrame* SfxViewFrame::GetTopViewFrame() const
{
return GetFrame().GetTopFrame().GetCurrentViewFrame();
@@ -3054,8 +2979,6 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
}
}
-void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
-
/* [Description]
This method can be included in the Execute method for the on- and off-
@@ -3063,7 +2986,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
Simply include as 'ExecuteMethod' in the IDL.
*/
-
+void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
{
// Evaluate Parameter
sal_uInt16 nSID = rReq.GetSlot();
@@ -3148,10 +3071,6 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
}
}
-
-
-void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
-
/* [Description]
This method can be used in the state method for the on and off-state
@@ -3159,7 +3078,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
Just register the IDL as 'StateMethod'.
*/
-
+void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
{
SfxWhichIter aIter( rState );
for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
@@ -3226,7 +3145,6 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
}
}
-
SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ )
{
SfxWorkWindow* pWork = GetFrame().GetWorkWindow_Impl();
@@ -3240,8 +3158,6 @@ void SfxViewFrame::SetChildWindow(sal_uInt16 nId, bool bOn, bool bSetFocus )
pWork->SetChildWindow_Impl( nId, bOn, bSetFocus );
}
-
-
void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
@@ -3249,24 +3165,18 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
pWork->ToggleChildWindow_Impl( nId, true );
}
-
-
bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
return pWork && pWork->HasChildWindow_Impl(nId);
}
-
-
bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
return pWork && pWork->KnowsChildWindow_Impl(nId);
}
-
-
void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
@@ -3277,8 +3187,6 @@ void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible )
}
}
-
-
SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId)
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
@@ -3300,7 +3208,6 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame )
SfxGetpApp()->SetViewFrame_Impl( pFrame );
}
-
void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
{
SolarMutexGuard aGuard;
@@ -3318,7 +3225,6 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::
pViewFrame->ActivateToolPanel_Impl( i_rPanelURL );
}
-
void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL )
{
// ensure the task pane is visible
commit 6c7b5b03cee4d2981177cb065e533031683c4bad
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sun May 31 22:40:06 2015 +0200
no need to make that separate statements
Change-Id: I2b08d200f1e361cdb3f3d3c12fec1b3377b81e30
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bcca3cf..bddf110 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3229,8 +3229,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ )
{
- SfxWorkWindow* pWork = 0;
- pWork = GetFrame().GetWorkWindow_Impl();
+ SfxWorkWindow* pWork = GetFrame().GetWorkWindow_Impl();
return pWork;
}
commit 9509ce61031f27dd1977599ffc271aaffdb6ca82
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri May 29 21:11:56 2015 +0200
some whitespace clean-up
Change-Id: I80aa6692c528176e38b5414145b484a32a9906f6
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index c9b2dcb..9f7749c 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -494,61 +494,59 @@ private:
};
private:
- mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
+ mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
- mutable ::osl::Mutex m_aControllerMutex;
+ mutable ::osl::Mutex m_aControllerMutex;
bool m_bSuspended;
bool m_bCanClose;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
//model
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
- mutable ::osl::Mutex m_aModelMutex;
- TheModelRef m_aModel;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
+ mutable ::osl::Mutex m_aModelMutex;
+ TheModelRef m_aModel;
//view
- VclPtr<ChartWindow> m_pChartWindow;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xViewWindow;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface > m_xChartView;
+ VclPtr<ChartWindow> m_pChartWindow;
+ ::com::sun::star::uno::Reference<::com::sun::star::awt::XWindow> m_xViewWindow;
+ ::com::sun::star::uno::Reference<::com::sun::star::uno::XInterface> m_xChartView;
::boost::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
- DrawViewWrapper* m_pDrawViewWrapper;
+ DrawViewWrapper* m_pDrawViewWrapper;
- Selection m_aSelection;
- SdrDragMode m_eDragMode;
+ Selection m_aSelection;
+ SdrDragMode m_eDragMode;
- Timer m_aDoubleClickTimer;
+ Timer m_aDoubleClickTimer;
bool m_bWaitingForDoubleClick;
bool m_bWaitingForMouseUp;
bool m_bConnectingToView;
- ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
- ::std::unique_ptr< UndoGuard > m_pTextActionUndoGuard;
+ ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
+ ::std::unique_ptr< UndoGuard > m_pTextActionUndoGuard;
/// needed for dispatching URLs in FeatureStateEvents
mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
- ::std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute;
+ ::std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute;
CommandDispatchContainer m_aDispatchContainer;
- ::std::unique_ptr< DropTargetHelper > m_apDropTargetHelper;
+ ::std::unique_ptr< DropTargetHelper > m_apDropTargetHelper;
::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XLayoutManagerEventBroadcaster >
- m_xLayoutManagerEventBroadcaster;
+ ::com::sun::star::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster;
- ChartDrawMode m_eDrawMode;
+ ChartDrawMode m_eDrawMode;
private:
//private methods
- bool impl_isDisposedOrSuspended() const;
+ bool impl_isDisposedOrSuspended() const;
ReferenceSizeProvider* impl_createReferenceSizeProvider();
- void impl_adaptDataSeriesAutoResize();
+ void impl_adaptDataSeriesAutoResize();
- void impl_createDrawViewController();
- void impl_deleteDrawViewController();
+ void impl_createDrawViewController();
+ void impl_deleteDrawViewController();
//executeDispatch methods
void executeDispatch_ObjectProperties();
@@ -558,69 +556,69 @@ private:
void executeDispatch_ChartType();
- void executeDispatch_InsertTitles();
- void executeDispatch_InsertLegend();
- void executeDispatch_DeleteLegend();
- void executeDispatch_OpenLegendDialog();
- void executeDispatch_InsertAxes();
- void executeDispatch_InsertGrid();
-
- void executeDispatch_InsertMenu_DataLabels();
- void executeDispatch_InsertMenu_Trendlines();
- void executeDispatch_InsertMenu_MeanValues();
-
- void executeDispatch_InsertMeanValue();
- void executeDispatch_InsertTrendline();
- void executeDispatch_InsertTrendlineEquation( bool bInsertR2=false );
- void executeDispatch_InsertErrorBars( bool bYError );
-
- void executeDispatch_InsertR2Value();
- void executeDispatch_DeleteR2Value();
-
- void executeDispatch_DeleteMeanValue();
- void executeDispatch_DeleteTrendline();
- void executeDispatch_DeleteTrendlineEquation();
- void executeDispatch_DeleteErrorBars( bool bYError );
-
- void executeDispatch_InsertDataLabels();
- void executeDispatch_InsertDataLabel();
- void executeDispatch_DeleteDataLabels();
- void executeDispatch_DeleteDataLabel();
-
- void executeDispatch_ResetAllDataPoints();
- void executeDispatch_ResetDataPoint();
-
- void executeDispatch_InsertAxis();
- void executeDispatch_InsertAxisTitle();
- void executeDispatch_InsertMajorGrid();
- void executeDispatch_InsertMinorGrid();
- void executeDispatch_DeleteAxis();
- void executeDispatch_DeleteMajorGrid();
- void executeDispatch_DeleteMinorGrid();
+ void executeDispatch_InsertTitles();
+ void executeDispatch_InsertLegend();
+ void executeDispatch_DeleteLegend();
+ void executeDispatch_OpenLegendDialog();
+ void executeDispatch_InsertAxes();
+ void executeDispatch_InsertGrid();
+
+ void executeDispatch_InsertMenu_DataLabels();
+ void executeDispatch_InsertMenu_Trendlines();
+ void executeDispatch_InsertMenu_MeanValues();
+
+ void executeDispatch_InsertMeanValue();
+ void executeDispatch_InsertTrendline();
+ void executeDispatch_InsertTrendlineEquation( bool bInsertR2=false );
+ void executeDispatch_InsertErrorBars( bool bYError );
+
+ void executeDispatch_InsertR2Value();
+ void executeDispatch_DeleteR2Value();
+
+ void executeDispatch_DeleteMeanValue();
+ void executeDispatch_DeleteTrendline();
+ void executeDispatch_DeleteTrendlineEquation();
+ void executeDispatch_DeleteErrorBars( bool bYError );
+
+ void executeDispatch_InsertDataLabels();
+ void executeDispatch_InsertDataLabel();
+ void executeDispatch_DeleteDataLabels();
+ void executeDispatch_DeleteDataLabel();
+
+ void executeDispatch_ResetAllDataPoints();
+ void executeDispatch_ResetDataPoint();
+
+ void executeDispatch_InsertAxis();
+ void executeDispatch_InsertAxisTitle();
+ void executeDispatch_InsertMajorGrid();
+ void executeDispatch_InsertMinorGrid();
+ void executeDispatch_DeleteAxis();
+ void executeDispatch_DeleteMajorGrid();
+ void executeDispatch_DeleteMinorGrid();
void executeDispatch_InsertSpecialCharacter();
void executeDispatch_EditText( const Point* pMousePixel = NULL );
void executeDispatch_SourceData();
void executeDispatch_MoveSeries( bool bForward );
- void StartTextEdit( const Point* pMousePixel = NULL );
- bool EndTextEdit();
+ void StartTextEdit( const Point* pMousePixel = NULL );
+ bool EndTextEdit();
void executeDispatch_View3D();
void executeDispatch_PositionAndSize();
- void executeDispatch_EditData();
+ void executeDispatch_EditData();
- void executeDispatch_NewArrangement();
- void executeDispatch_ScaleText();
+ void executeDispatch_NewArrangement();
+ void executeDispatch_ScaleText();
- void executeDispatch_Paste();
- void executeDispatch_Copy();
- void executeDispatch_Cut();
- bool executeDispatch_Delete();
- void executeDispatch_ToggleLegend();
- void executeDispatch_ToggleGridHorizontal();
- void executeDispatch_ToggleGridVertical();
+ void executeDispatch_Paste();
+ void executeDispatch_Copy();
+ void executeDispatch_Cut();
+ bool executeDispatch_Delete();
+ void executeDispatch_ToggleLegend();
+ void executeDispatch_ToggleGridHorizontal();
+ void executeDispatch_ToggleGridVertical();
void impl_ShapeControllerDispatch( const ::com::sun::star::util::URL& rURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
commit 3ba41fe801733d25eab7fc1685990cff5f27ed01
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri May 29 21:05:52 2015 +0200
document chart2 layout dump
Change-Id: Iad7975eed4508e2b78ec8376a9a4db0679442a55
diff --git a/chart2/README b/chart2/README
index c6a5495..56eb0ed 100644
--- a/chart2/README
+++ b/chart2/README
@@ -1,4 +1,9 @@
Chart implementation for LibreOffice Calc.
The chart2 denotes a second generation re-write done to rid us of the
-foul and twisted legacy chart code.
\ No newline at end of file
+foul and twisted legacy chart code.
+
+== Debugging ==
+
+=== CTRL + F12 ===
+This creates a layout dump based on the XShapeDumper based on SAL_WARN("chart2", ...
commit e6c499c4cbd3e420b3bb489807eb903aa8cf2820
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri May 29 18:04:53 2015 +0200
OSL_FAIL to SAL_WARN
Change-Id: Ic5d96e091f307798941e43368cbd2daf9f84e73c
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 78fe32a..2679a3e 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -376,7 +376,7 @@ void ResourceManager::ReadContextList (
}
else
{
- OSL_FAIL("application name not recognized");
+ SAL_WARN("sfx2.sidebar", "application name " << sApplicationName << " not recognized");
continue;
}
}
commit f0c26f340b9ce6540c04d19f5aedef3d762e228a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri May 29 18:04:24 2015 +0200
move header file out sc/inc
Change-Id: I1b8e94612ffb4cf71bb16b424af37f4f8781775f
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
similarity index 100%
rename from sc/inc/ScPanelFactory.hxx
rename to sc/source/ui/sidebar/ScPanelFactory.hxx
commit 5a182a26dd94ff856e4d7567663f363ea11c6429
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri May 29 18:00:35 2015 +0200
remove unused include
Change-Id: I2dd5d2c87849c27ed96890699e326a26a19b14a4
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index f387534..eb82931 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -38,7 +38,6 @@
#include "funcdesc.hxx"
#include <com/sun/star/document/LinkUpdateModes.hpp>
#include <com/sun/star/sheet/FunctionArgument.hpp>
-#include "ScPanelFactory.hxx"
#include <boost/scoped_array.hpp>
using namespace com::sun::star;
More information about the Libreoffice-commits
mailing list