Skip to content

C
core
Kaydet (Commit) 73318c3d authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

adapt code to select source .ui 

Change-Id: I65d3f5acbe95985269c03b3e0c57c5cc80ca30d4
üst 5afadf4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 153 deletions
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ 73318c3d
...@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/sheetprintpage \ sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \ sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/selectsource \
sc/uiconfig/scalc/ui/sortcriteriapage \ sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \ sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \ sc/uiconfig/scalc/ui/sortoptionspage \
......
sc/inc/helpids.h
Dosyayı görüntüle @ 73318c3d
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" #define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE"
#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" #define HID_PASSWD_DOC "SC_HID_PASSWD_DOC"
#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE"
#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" #define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE"
#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" #define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE"
......
sc/inc/sc.hrc
Dosyayı görüntüle @ 73318c3d
...@@ -1060,7 +1060,7 @@ ...@@ -1060,7 +1060,7 @@
#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) #define WID_SIMPLE_REF (SC_DIALOGS_START + 126)
#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) #define RID_POPUP_CHANGES (SC_DIALOGS_START + 127)
#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129)
#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) #define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130)
#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) #define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131)
......
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ 73318c3d
...@@ -358,7 +358,8 @@ public: ...@@ -358,7 +358,8 @@ public:
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent,
bool bEnableExternal) = 0;
virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
const com::sun::star::uno::Sequence<OUString>& rServices, const com::sun::star::uno::Sequence<OUString>& rServices,
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ 73318c3d
...@@ -773,31 +773,13 @@ AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilo ...@@ -773,31 +773,13 @@ AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilo
return 0; return 0;
} }
AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg(
Window* pParent, bool bEnableExternal)
AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
sal_Bool bEnableExternal,
int nId )
{ {
ScDataPilotSourceTypeDlg * pDlg=NULL; ScDataPilotSourceTypeDlg* pDlg = new ScDataPilotSourceTypeDlg(pParent, bEnableExternal);
switch ( nId ) return new AbstractScDataPilotSourceTypeDlg_Impl(pDlg);
{
case RID_SCDLG_DAPITYPE :
pDlg = new ScDataPilotSourceTypeDlg( pParent, bEnableExternal );
break;
default:
break;
}
if ( pDlg )
return new AbstractScDataPilotSourceTypeDlg_Impl( pDlg );
return 0;
} }
// add for ScDataPilotSourceTypeDlg end
AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent, AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<OUString>& rServices, const com::sun::star::uno::Sequence<OUString>& rServices,
int nId ) int nId )
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ 73318c3d
...@@ -426,7 +426,8 @@ public: ...@@ -426,7 +426,8 @@ public:
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg
virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent,
bool bEnableExternal);
virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
const com::sun::star::uno::Sequence<OUString>& rServices, const com::sun::star::uno::Sequence<OUString>& rServices,
......
sc/source/ui/dbgui/dapitype.cxx
Dosyayı görüntüle @ 73318c3d
...@@ -33,34 +33,27 @@ using namespace com::sun::star; ...@@ -33,34 +33,27 @@ using namespace com::sun::star;
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal ) : ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal)
ModalDialog ( pParent, ScResId( RID_SCDLG_DAPITYPE ) ), : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" )
//
aFlFrame ( this, ScResId( FL_FRAME ) ),
aBtnSelection ( this, ScResId( BTN_SELECTION ) ),
aBtnNamedRange ( this, ScResId( BTN_NAMED_RANGE ) ),
aBtnDatabase ( this, ScResId( BTN_DATABASE ) ),
aBtnExternal ( this, ScResId( BTN_EXTERNAL ) ),
aLbNamedRange ( this, ScResId( LB_NAMED_RANGE ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) )
{ {
aBtnSelection.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); get(m_pBtnSelection, "selection");
aBtnNamedRange.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); get(m_pBtnNamedRange, "namedrange");
aBtnDatabase.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); get(m_pBtnDatabase, "database");
aBtnExternal.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); get(m_pBtnExternal, "external");
get(m_pLbNamedRange, "rangelb");
m_pBtnSelection->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnNamedRange->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnDatabase->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnExternal->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
if (!bEnableExternal) if (!bEnableExternal)
aBtnExternal.Disable(); m_pBtnExternal->Disable();
aBtnSelection.Check(); m_pBtnSelection->Check();
// Disabled unless at least one named range exists. // Disabled unless at least one named range exists.
aLbNamedRange.Disable(); m_pLbNamedRange->Disable();
aBtnNamedRange.Disable(); m_pBtnNamedRange->Disable();
FreeResource();
} }
ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
...@@ -69,39 +62,39 @@ ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() ...@@ -69,39 +62,39 @@ ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
bool ScDataPilotSourceTypeDlg::IsDatabase() const bool ScDataPilotSourceTypeDlg::IsDatabase() const
{ {
return aBtnDatabase.IsChecked(); return m_pBtnDatabase->IsChecked();
} }
bool ScDataPilotSourceTypeDlg::IsExternal() const bool ScDataPilotSourceTypeDlg::IsExternal() const
{ {
return aBtnExternal.IsChecked(); return m_pBtnExternal->IsChecked();
} }
bool ScDataPilotSourceTypeDlg::IsNamedRange() const bool ScDataPilotSourceTypeDlg::IsNamedRange() const
{ {
return aBtnNamedRange.IsChecked(); return m_pBtnNamedRange->IsChecked();
} }
OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const
{ {
sal_uInt16 nPos = aLbNamedRange.GetSelectEntryPos(); sal_uInt16 nPos = m_pLbNamedRange->GetSelectEntryPos();
return aLbNamedRange.GetEntry(nPos); return m_pLbNamedRange->GetEntry(nPos);
} }
void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
{ {
aLbNamedRange.InsertEntry(rName); m_pLbNamedRange->InsertEntry(rName);
if (aLbNamedRange.GetEntryCount() == 1) if (m_pLbNamedRange->GetEntryCount() == 1)
{ {
// Select position 0 only for the first time. // Select position 0 only for the first time.
aLbNamedRange.SelectEntryPos(0); m_pLbNamedRange->SelectEntryPos(0);
aBtnNamedRange.Enable(); m_pBtnNamedRange->Enable();
} }
} }
IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn )
{ {
aLbNamedRange.Enable(pBtn == &aBtnNamedRange); m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange);
return 0; return 0;
} }
......
sc/source/ui/dbgui/dapitype.hrc
Dosyayı görüntüle @ 73318c3d
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
#define BTN_SELECTION 4
#define BTN_NAMED_RANGE 5
#define BTN_DATABASE 6
#define BTN_EXTERNAL 7
#define FL_FRAME 8 #define FL_FRAME 8
#define FT_SERVICE 9 #define FT_SERVICE 9
...@@ -43,6 +39,4 @@ ...@@ -43,6 +39,4 @@
#define FT_OBJTYPE 23 #define FT_OBJTYPE 23
#define LB_OBJTYPE 24 #define LB_OBJTYPE 24
#define LB_NAMED_RANGE 25
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/dapitype.src
Dosyayı görüntüle @ 73318c3d
...@@ -20,83 +20,6 @@ ...@@ -20,83 +20,6 @@
#include "sc.hrc" #include "sc.hrc"
#include "dapitype.hrc" #include "dapitype.hrc"
ModalDialog RID_SCDLG_DAPITYPE
{
Text [ en-US ] = "Select Source";
OutputSize = TRUE ;
HelpId = HID_DATAPILOT_TYPE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 241 , 76 ) ;
Moveable = TRUE ;
Closeable = FALSE ;
FixedLine FL_FRAME
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 173 , 8 ) ;
Text [ en-US ] = "Selection";
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 185 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 185 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 185 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
RadioButton BTN_SELECTION
{
Pos = MAP_APPFONT ( 12 , 18 ) ;
Size = MAP_APPFONT ( 164 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Current selection";
};
RadioButton BTN_NAMED_RANGE
{
Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Named range";
};
ListBox LB_NAMED_RANGE
{
Pos = MAP_APPFONT ( 100 , 31 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
RadioButton BTN_DATABASE
{
Pos = MAP_APPFONT ( 12 , 46 ) ;
Size = MAP_APPFONT ( 164 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Data source registered in %PRODUCTNAME";
};
RadioButton BTN_EXTERNAL
{
Pos = MAP_APPFONT ( 12 , 60 ) ;
Size = MAP_APPFONT ( 164 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~External source/interface";
};
};
//------------------------------------------------------------------------
ModalDialog RID_SCDLG_DAPISERVICE ModalDialog RID_SCDLG_DAPISERVICE
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
......
sc/source/ui/inc/dapitype.hxx
Dosyayı görüntüle @ 73318c3d
...@@ -32,19 +32,15 @@ ...@@ -32,19 +32,15 @@
class ScDataPilotSourceTypeDlg : public ModalDialog class ScDataPilotSourceTypeDlg : public ModalDialog
{ {
private: private:
FixedLine aFlFrame; RadioButton* m_pBtnSelection;
RadioButton aBtnSelection; RadioButton* m_pBtnNamedRange;
RadioButton aBtnNamedRange; RadioButton* m_pBtnDatabase;
RadioButton aBtnDatabase; RadioButton* m_pBtnExternal;
RadioButton aBtnExternal; ListBox* m_pLbNamedRange;
ListBox aLbNamedRange;
OKButton aBtnOk;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
public: public:
ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal ); ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal);
~ScDataPilotSourceTypeDlg(); ~ScDataPilotSourceTypeDlg();
bool IsDatabase() const; bool IsDatabase() const;
bool IsExternal() const; bool IsExternal() const;
......
sc/source/ui/view/cellsh1.cxx
Dosyayı görüntüle @ 73318c3d
...@@ -2479,7 +2479,7 @@ void ScCellShell::ExecuteDataPilotDialog() ...@@ -2479,7 +2479,7 @@ void ScCellShell::ExecuteDataPilotDialog()
::boost::scoped_ptr<AbstractScDataPilotSourceTypeDlg> pTypeDlg( ::boost::scoped_ptr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
pFact->CreateScDataPilotSourceTypeDlg( pFact->CreateScDataPilotSourceTypeDlg(
pTabViewShell->GetDialogParent(), bEnableExt, RID_SCDLG_DAPITYPE)); pTabViewShell->GetDialogParent(), bEnableExt));
// Populate named ranges (if any). // Populate named ranges (if any).
ScRangeName* pRangeName = pDoc->GetRangeName(); ScRangeName* pRangeName = pDoc->GetRangeName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment