[Libreoffice-commits] .: 2 commits - sc/inc sc/sdi sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 17 12:48:20 PST 2011
sc/inc/scabstdlg.hxx | 7 -------
sc/inc/scmod.hxx | 6 ------
sc/sdi/scalc.sdi | 2 --
sc/source/ui/app/scdll.cxx | 7 -------
sc/source/ui/attrdlg/scdlgfact.cxx | 6 ------
sc/source/ui/docshell/docsh.cxx | 2 --
sc/source/ui/inc/docsh.hxx | 2 --
sc/source/ui/inc/reffact.hxx | 2 --
sc/source/ui/miscdlgs/anyrefdg.cxx | 10 ++--------
sc/source/ui/vba/vbahelper.cxx | 2 +-
sc/source/ui/view/cellsh2.cxx | 4 ----
sc/source/ui/view/reffact.cxx | 9 ---------
sc/source/ui/view/tabvwsh.cxx | 3 ---
13 files changed, 3 insertions(+), 59 deletions(-)
New commits:
commit 5457b43d6e7c29941f7d6e2ea003e7f709460110
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 16 23:46:06 2011 +0100
Removed some bogus comments 'Added by PengYunQuan for Validity Cell Range Picker' and some dead code.
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 3584805..12d6378 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -56,9 +56,7 @@ class SfxStyleSheetBase;
class ScDPObject;
struct ScDPFuncData;
struct ScDPNumGroupInfo;
-//<!--Added by PengYunQuan for Validity Cell Range Picker
class ScTabViewShell;
-//-->Added by PengYunQuan for Validity Cell Range Picker
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
@@ -502,13 +500,8 @@ public:
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg
int nId ) = 0;
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
- // const SfxItemSet* pArgSet,int nId ) = 0;
-
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0;
- //-->Modified by PengYunQuan for Validity Cell Range Picker
virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg
const SfxItemSet* pArgSet,int nId ) = 0;
// for tabpage
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 313bb9f..1c7f53d 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -39,11 +39,9 @@
#include <unotools/options.hxx>
#include <tools/shl.hxx>
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#include <map>
#include <list>
#include <algorithm>
-//-->Added by PengYunQuan for Validity Cell Range Picker
class KeyEvent;
@@ -147,9 +145,7 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
bool mbIsInSharedDocLoading;
bool mbIsInSharedDocSaving;
- //<!--Added by PengYunQuan for Validity Cell Range Picker
std::map<USHORT, std::list<Window*> > m_mapRefWindow;
- //-->Added by PengYunQuan for Validity Cell Range Picker
public:
SFX_DECL_INTERFACE(SCID_APP)
@@ -259,9 +255,7 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt );
ScFormEditData* GetFormEditData() { return pFormEditData; }
// Referenzeingabe:
- //<!--Added by PengYunQuan for Validity Cell Range Picker
SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
- //-->Added by PengYunQuan for Validity Cell Range Picker
BOOL IsModalMode(SfxObjectShell* pDocSh = NULL);
BOOL IsFormulaMode();
BOOL IsRefDialogOpen();
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 0628d84..5b8b3cc 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2802,7 +2802,6 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
]
//--------------------------------------------------------------------------
-//<!--Added by PengYunQuan for Validity Cell Range Picker
SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
()
[
@@ -2826,7 +2825,6 @@ SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
ToolBoxConfig = TRUE,
GroupId = GID_OPTIONS;
]
-//-->Added by PengYunQuan for Validity Cell Range Picker
//--------------------------------------------------------------------------
SfxVoidItem GoDownToEndOfData SID_CURSORBLKDOWN
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 0d39cf8..a022978 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -294,20 +294,13 @@ void ScDLL::Init()
ScSpellDialogChildWindow ::RegisterChildWindow(FALSE, pMod);
::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod);
- //<!--Added by PengYunQuan for Validity Cell Range Picker
ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod);
- //-->Added by PengYunQuan for Validity Cell Range Picker
// Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
-// rClassManager.SV_CLASS_REGISTER( SvxURLField );
-// rClassManager.SV_CLASS_REGISTER( SvxDateField );
-// rClassManager.SV_CLASS_REGISTER( SvxPageField );
rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-// rClassManager.SV_CLASS_REGISTER( SvxTimeField );
rClassManager.SV_CLASS_REGISTER( SvxFileField );
-// rClassManager.SV_CLASS_REGISTER( SvxExtFileField );
rClassManager.SV_CLASS_REGISTER( SvxTableField );
SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index c7f8a46..37bfa7f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1534,19 +1534,13 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
//add for ScValidationDlg begin
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent,
-//<!--Modified by PengYunQuan for Validity Cell Range Picker
-// const SfxItemSet* pArgSet,int nId )
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh )
-//-->Modified by PengYunQuan for Validity Cell Range Picke
{
SfxTabDialog* pDlg=NULL;
switch ( nId )
{
case TAB_DLG_VALIDATION :
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //pDlg = new ScValidationDlg( pParent, pArgSet );
pDlg = new ScValidationDlg( pParent, pArgSet, pTabVwSh );
- //-->Modified by PengYunQuan for Validity Cell Range Picker
break;
default:
break;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 105469b..0fcb91e 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2929,7 +2929,6 @@ void ScDocShellModificator::SetDocumentModified()
}
}
-//<!--Added by PengYunQuan for Validity Cell Range Picker
sal_Bool ScDocShell::AcceptStateUpdate() const
{
if( SfxObjectShell::AcceptStateUpdate() )
@@ -2940,7 +2939,6 @@ sal_Bool ScDocShell::AcceptStateUpdate() const
return sal_False;
}
-//-->Added by PengYunQuan for Validity Cell Range Picker
bool ScDocShell::IsChangeRecording() const
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 196f466..ade83b8 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -427,9 +427,7 @@ public:
const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
void SetSolverSaveData( const ScOptSolverSave& rData );
- //<!--Added by PengYunQuan for Validity Cell Range Picker
sal_Bool AcceptStateUpdate() const;
- //-->Added by PengYunQuan for Validity Cell Range Picker
ScSheetSaveData* GetSheetSaveData();
void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType );
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index cc09603..e3b5236 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -100,7 +100,6 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
void StartRefInput();
};
-//<!--Added by PengYunQuan for Validity Cell Range Picker
class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
{
bool m_bVisibleLock:1;
@@ -115,7 +114,6 @@ public:
void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); }
void Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); }
};
-//-->Added by PengYunQuan for Validity Cell Range Picker
//==================================================================
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index e5d05b9..b1f09bc 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -346,7 +346,7 @@ void ScFormulaReferenceHelper::Init()
pRefComp->SetCompileForFAP(TRUE);
nRefTab = nTab;
- } // if ( pViewData )
+ }
}
// -----------------------------------------------------------------------------
IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel )
@@ -368,10 +368,7 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel )
//----------------------------------------------------------------------------
void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
{
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //if (pRefEdit && (bForced || !pRefBtn))
- if ( CanInputDone( bForced ) )//if (pRefEdit && (bForced || !pRefBtn))
- //-->Modified by PengYunQuan for Validity Cell Range Picker
+ if ( CanInputDone( bForced ) )
{
if (bAccInserted) // Accelerator wieder abschalten
{
@@ -738,8 +735,6 @@ bool ScRefHandler::EnterRefMode()
m_aHelper.Init();
m_aHelper.SetDispatcherLock( TRUE );
- //@Test
- //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702
return m_bInRefMode = true;
}
@@ -765,7 +760,6 @@ bool ScRefHandler::LeaveRefMode()
if( pScViewShell )
pScViewShell->UpdateInputHandler(TRUE);
- //SFX_APPWINDOW->Enable(TRUE,TRUE);
lcl_InvalidateWindows();
m_bInRefMode = false;
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 2934a15..bb4aea2 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -196,7 +196,6 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
return bSort;
}
-//<!-- Added by PengYunQuan for Validity Cell Range Picker
//after end execute from !IsModalInputMode, it is safer to delay deleting
namespace
{
@@ -206,7 +205,6 @@ namespace
return 0;
}
}
-//--> Added by PengYunQuan for Validity Cell Range Picker
void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
@@ -1131,11 +1129,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
pTabViewShell->SetValidation( aData );
rReq.Done( *pOutSet );
}
- //<!-- Modified by PengYunQuan for Validity Cell Range Picker
//after end execute from !IsModalInputMode, it is safer to delay deleting
//delete pDlg;
Application::PostUserEvent( Link( pDlg, &DelayDeleteAbstractDialog ) );
- //--> Modified by PengYunQuan for Validity Cell Range Picker
}
}
break;
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index fde082b..d984c94 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -45,9 +45,7 @@
#include "acredlin.hxx"
#include "simpref.hxx"
#include "scmod.hxx"
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#include "validate.hxx"
-//<!--Added by PengYunQuan for Validity Cell Range Picker
// -----------------------------------------------------------------------
@@ -72,8 +70,6 @@ SFX_IMPL_CHILDWINDOW(ScFunctionDlgWrapper, SID_OPENDLG_FUNCTION )
SFX_IMPL_CHILDWINDOW(ScEditFunctionDlgWrapper, SID_OPENDLG_EDITFUNCTION )
SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT )
*/
-//<!--Added by PengYunQuan for Validity Cell Range Picker
-//SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE )
SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
{
@@ -92,7 +88,6 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
}
namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#define IMPL_CHILD_CTOR(Class,sid) \
Class::Class( Window* pParentP, \
@@ -101,7 +96,6 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
SfxChildWinInfo* pInfo ) \
: SfxChildWindow(pParentP, nId) \
{ \
- /*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\
/************************************************************************************/\
/* When a new document is creating, the SfxViewFrame may be ready, */\
/* But the ScTabViewShell may have not been activated yet. In this */\
@@ -109,7 +103,6 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
/* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\
/************************************************************************************/\
ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \
- /*//-->Added by PengYunQuan for Validity Cell Range Picker*/\
if (!pViewShell) \
pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \
DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
@@ -362,7 +355,6 @@ void ScAcceptChgDlgWrapper::ReInitDlg()
IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW )
-//<!--Added by PengYunQuan for Validity Cell Range Picker
namespace
{
ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings )
@@ -408,6 +400,5 @@ ScValidityRefChildWin::~ScValidityRefChildWin()
if( m_bFreeWindowLock )
pWindow = NULL;
}
-//-->Added by PengYunQuan for Validity Cell Range Picker
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index fdbd07b..f0ecfdc 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -97,10 +97,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() );
-
- //<!--Added by PengYunQuan for Validity Cell Range Picker
SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId());
- //-->Added by PengYunQuan for Validity Cell Range Picker
}
SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
commit d466de38ca10614446351a22c62d3fec82a138c8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Jan 16 23:25:23 2011 +0100
cppcheck: close bracket
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 4c8fe06..de2eca9 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -531,7 +531,7 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
break;
}
default:
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(( "Invalid type, can't convert" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid type, can't convert" ) ), uno::Reference< uno::XInterface >() );
}
return sString;
}
More information about the Libreoffice-commits
mailing list