summaryrefslogtreecommitdiff
path: root/extensions/source/bibliography
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/bibliography')
-rw-r--r--extensions/source/bibliography/bibbeam.cxx12
-rw-r--r--extensions/source/bibliography/bibbeam.hxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx18
-rw-r--r--extensions/source/bibliography/bibcont.hxx8
-rw-r--r--extensions/source/bibliography/bibload.cxx2
-rw-r--r--extensions/source/bibliography/bibshortcuthandler.hxx18
-rw-r--r--extensions/source/bibliography/bibtools.hxx6
-rw-r--r--extensions/source/bibliography/bibview.cxx2
-rw-r--r--extensions/source/bibliography/bibview.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx12
-rw-r--r--extensions/source/bibliography/datman.hxx6
-rw-r--r--extensions/source/bibliography/framectr.cxx22
-rw-r--r--extensions/source/bibliography/general.cxx12
-rw-r--r--extensions/source/bibliography/general.hxx6
-rw-r--r--extensions/source/bibliography/toolbar.cxx2
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
16 files changed, 66 insertions, 66 deletions
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index c48327763351..72120f8d36ce 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -47,9 +47,9 @@ namespace bib
using namespace ::com::sun::star::uno;
- void HandleTaskPaneList( Window* pWindow, bool bAddToList )
+ void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList )
{
- Window* pParent = pWindow->GetParent();
+ vcl::Window* pParent = pWindow->GetParent();
DBG_ASSERT( pParent, "-GetTaskPaneList(): everybody here should have a parent!" );
@@ -69,7 +69,7 @@ namespace bib
class BibGridwin
- :public Window //DockingWindow
+ :public vcl::Window //DockingWindow
{
private:
Reference< awt::XWindow > m_xGridWin;
@@ -85,7 +85,7 @@ namespace bib
public:
- BibGridwin(Window* pParent, WinBits nStyle = WB_3DLOOK );
+ BibGridwin(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK );
virtual ~BibGridwin();
void createGridWin(const Reference< awt::XControlModel > & xDbForm);
@@ -98,7 +98,7 @@ namespace bib
virtual void GetFocus() SAL_OVERRIDE;
};
- BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle )
+ BibGridwin::BibGridwin( vcl::Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle )
{
m_xControlContainer = VCLUnoHelper::CreateControlContainer(this);
@@ -180,7 +180,7 @@ namespace bib
m_xGridWin->setFocus();
}
- BibBeamer::BibBeamer( Window* _pParent, BibDataManager* _pDM, WinBits _nStyle )
+ BibBeamer::BibBeamer( vcl::Window* _pParent, BibDataManager* _pDM, WinBits _nStyle )
:BibSplitWindow( _pParent, _nStyle | WB_NOSPLITDRAW )
,pDatMan( _pDM )
,pToolBar( NULL )
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index c4e15925ffe1..e36bc7906453 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -70,7 +70,7 @@ namespace bib
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception >
getDispatchProviderInterception();
- BibBeamer(Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK );
+ BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK );
virtual ~BibBeamer();
void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 955f47919f2c..b48aa514b361 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -43,7 +43,7 @@ bool BibShortCutHandler::HandleShortCutKey( const KeyEvent& )
}
-BibWindow::BibWindow( Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ), BibShortCutHandler( this )
+BibWindow::BibWindow( vcl::Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ), BibShortCutHandler( this )
{
}
@@ -52,7 +52,7 @@ BibWindow::~BibWindow()
}
-BibSplitWindow::BibSplitWindow( Window* pParent, WinBits nStyle ) : SplitWindow( pParent, nStyle ), BibShortCutHandler( this )
+BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWindow( pParent, nStyle ), BibShortCutHandler( this )
{
}
@@ -60,7 +60,7 @@ BibSplitWindow::~BibSplitWindow()
{
}
-BibTabPage::BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
+BibTabPage::BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
TabPage( pParent, rID, rUIXMLDescription ), BibShortCutHandler( this )
{
}
@@ -80,13 +80,13 @@ using namespace ::rtl;
#define WIN_MIN_HEIGHT 10
#define WIN_STEP_SIZE 5
-BibWindowContainer::BibWindowContainer( Window* pParent, BibShortCutHandler* pChildWin, WinBits nStyle ) :
+BibWindowContainer::BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChildWin, WinBits nStyle ) :
BibWindow( pParent, nStyle ),
pChild( pChildWin )
{
if(pChild!=NULL)
{
- Window* pChildWindow = GetChild();
+ vcl::Window* pChildWindow = GetChild();
pChildWindow->SetParent(this);
pChildWindow->Show();
pChildWindow->SetPosPixel(Point(0,0));
@@ -97,7 +97,7 @@ BibWindowContainer::~BibWindowContainer()
{
if( pChild )
{
- Window* pDel = GetChild();
+ vcl::Window* pDel = GetChild();
pChild = NULL; // prevents GetFocus for child while deleting!
delete pDel;
}
@@ -121,7 +121,7 @@ bool BibWindowContainer::HandleShortCutKey( const KeyEvent& rKeyEvent )
}
-BibBookContainer::BibBookContainer(Window* pParent, WinBits nStyle):
+BibBookContainer::BibBookContainer(vcl::Window* pParent, WinBits nStyle):
BibSplitWindow(pParent,nStyle),
pTopWin(NULL),
pBottomWin(NULL)
@@ -140,14 +140,14 @@ BibBookContainer::~BibBookContainer()
if( pTopWin )
{
- Window* pDel = pTopWin;
+ vcl::Window* pDel = pTopWin;
pTopWin = NULL; // prevents GetFocus for child while deleting!
delete pDel;
}
if( pBottomWin )
{
- Window* pDel = pBottomWin;
+ vcl::Window* pDel = pBottomWin;
pBottomWin = NULL; // prevents GetFocus for child while deleting!
delete pDel;
}
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 67f7241973fe..7b2dacc01533 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -40,10 +40,10 @@ class BibWindowContainer : public BibWindow //Window
virtual void Resize() SAL_OVERRIDE;
public:
- BibWindowContainer( Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK);
+ BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK);
virtual ~BibWindowContainer();
- inline Window* GetChild();
+ inline vcl::Window* GetChild();
virtual void GetFocus() SAL_OVERRIDE;
@@ -52,7 +52,7 @@ class BibWindowContainer : public BibWindow //Window
using Window::GetChild;
};
-inline Window* BibWindowContainer::GetChild()
+inline vcl::Window* BibWindowContainer::GetChild()
{
return pChild? pChild->GetWindow() : NULL;
}
@@ -83,7 +83,7 @@ class BibBookContainer: public BibSplitWindow
public:
- BibBookContainer(Window* pParent, WinBits nStyle = WB_3DLOOK );
+ BibBookContainer(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK );
virtual ~BibBookContainer();
inline BibWindow* GetTopWin() {return pTopWin;}
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index feec3e9ede85..8a732ccb2b58 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -272,7 +272,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt
VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(aWindow);
assert(pParentComponent);
- Window* pParent = VCLUnoHelper::GetWindow( aWindow );
+ vcl::Window* pParent = VCLUnoHelper::GetWindow( aWindow );
BibBookContainer *pMyWindow = new BibBookContainer( pParent );
pMyWindow->Show();
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 6eb4231b3182..f8c87f395fb5 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -31,45 +31,45 @@
class BibShortCutHandler
{
private:
- Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window
+ vcl::Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window
protected:
- inline BibShortCutHandler( Window* pBaseClass );
+ inline BibShortCutHandler( vcl::Window* pBaseClass );
public:
virtual ~BibShortCutHandler();
virtual bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
- inline Window* GetWindow( void );
+ inline vcl::Window* GetWindow( void );
};
-inline BibShortCutHandler::BibShortCutHandler( Window* _pBaseClass ) : pBaseClass( _pBaseClass )
+inline BibShortCutHandler::BibShortCutHandler( vcl::Window* _pBaseClass ) : pBaseClass( _pBaseClass )
{
}
-inline Window* BibShortCutHandler::GetWindow( void )
+inline vcl::Window* BibShortCutHandler::GetWindow( void )
{
return pBaseClass;
}
-class BibWindow : public Window, public BibShortCutHandler
+class BibWindow : public vcl::Window, public BibShortCutHandler
{
public:
- BibWindow( Window* pParent,WinBits nStyle = WB_3DLOOK);
+ BibWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK);
virtual ~BibWindow();
};
class BibSplitWindow : public SplitWindow, public BibShortCutHandler
{
public:
- BibSplitWindow( Window* pParent,WinBits nStyle = WB_3DLOOK);
+ BibSplitWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK);
virtual ~BibSplitWindow();
};
class BibTabPage : public TabPage, public BibShortCutHandler
{
public:
- BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~BibTabPage();
};
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 4b0af71175b4..86a316fdb7ef 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -26,15 +26,15 @@ namespace bib
{
// source in bibbeam.cxx
- void HandleTaskPaneList( Window* pWindow, bool bAddToList );
+ void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList );
// pWindow: just an system window or something which is child of a system window
- inline void AddToTaskPaneList( Window* pWindowToBeHandled )
+ inline void AddToTaskPaneList( vcl::Window* pWindowToBeHandled )
{
HandleTaskPaneList( pWindowToBeHandled, true );
}
- inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
+ inline void RemoveFromTaskPaneList( vcl::Window* pWindowToBeHandled )
{
HandleTaskPaneList( pWindowToBeHandled, false );
}
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 1ecbe3db04f6..64929b2d8f47 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -47,7 +47,7 @@ namespace bib
- BibView::BibView( Window* _pParent, BibDataManager* _pManager, WinBits _nStyle )
+ BibView::BibView( vcl::Window* _pParent, BibDataManager* _pManager, WinBits _nStyle )
:BibWindow( _pParent, _nStyle )
,m_pDatMan( _pManager )
,m_xDatMan( _pManager )
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index a8d73ad7408a..add53d7c2bbe 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -59,7 +59,7 @@ namespace bib
virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
public:
- BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK );
+ BibView( vcl::Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK );
virtual ~BibView();
void UpdatePages();
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index f314500fccf5..49fa9581a30a 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -237,7 +237,7 @@ class MappingDialog_Impl : public ModalDialog
DECL_LINK(ListBoxSelectHdl, ListBox*);
public:
- MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan);
+ MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan);
virtual ~MappingDialog_Impl();
void SetModified() {bModified = true;}
@@ -255,7 +255,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
return USHRT_MAX;
}
-MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan)
+MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMan)
: ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui")
, pDatMan(pMan)
, sNone(BIB_RESSTR(RID_BIB_STR_NONE))
@@ -432,13 +432,13 @@ class DBChangeDialog_Impl : public ModalDialog
DECL_LINK(DoubleClickHdl, SvTabListBox*);
public:
- DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan );
+ DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan );
virtual ~DBChangeDialog_Impl();
OUString GetCurrentURL()const;
};
-DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
+DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan )
: ModalDialog(pParent, "ChooseDataSourceDialog",
"modules/sbibliography/ui/choosedatasourcedialog.ui")
,
@@ -1432,7 +1432,7 @@ void BibDataManager::RemoveMeAsUidListener()
}
}
-void BibDataManager::CreateMappingDialog(Window* pParent)
+void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
{
boost::scoped_ptr<MappingDialog_Impl> pDlg(new MappingDialog_Impl(pParent, this));
if(RET_OK == pDlg->Execute() && pBibView)
@@ -1441,7 +1441,7 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
}
}
-OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
+OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent)
{
OUString uRet;
boost::scoped_ptr<DBChangeDialog_Impl> pDlg(new DBChangeDialog_Impl(pParent, this ));
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 1bdd48b4a89f..fa52d0b7491a 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <cppuhelper/implbase1.hxx>
-class Window;
+namespace vcl { class Window; }
namespace bib
@@ -167,8 +167,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName,
bool bForceListBox = false);
- void CreateMappingDialog(Window* pParent);
- OUString CreateDBChangeDialog(Window* pParent);
+ void CreateMappingDialog(vcl::Window* pParent);
+ OUString CreateDBChangeDialog(vcl::Window* pParent);
void DispatchDBChangeDialog();
bool HasActiveConnection() const;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 7f997e5dd88a..13763bc8a575 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -183,7 +183,7 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi
,pDatMan( pDataManager )
,pBibMod(NULL)
{
- Window* pParent = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow );
pParent->SetUniqueId(UID_BIB_FRAME_WINDOW);
bDisposing=false;
bHierarchical=true;
@@ -398,15 +398,15 @@ bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XForm
return bResult;
}
-static Window* lcl_GetFocusChild( Window* pParent )
+static vcl::Window* lcl_GetFocusChild( vcl::Window* pParent )
{
sal_uInt16 nChildren = pParent->GetChildCount();
for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
{
- Window* pChild = pParent->GetChild( nChild );
+ vcl::Window* pChild = pParent->GetChild( nChild );
if(pChild->HasFocus())
return pChild;
- Window* pSubChild = lcl_GetFocusChild( pChild );
+ vcl::Window* pSubChild = lcl_GetFocusChild( pChild );
if(pSubChild)
return pSubChild;
}
@@ -421,7 +421,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
if ( !bDisposing )
{
::SolarMutexGuard aGuard;
- Window* pParent = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow );
WaitObject aWaitObject( pParent );
OUString aCommand( _rURL.Path);
@@ -613,7 +613,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand == "Cut")
{
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
if(pChild)
{
KeyEvent aEvent( 0, KEYFUNC_CUT );
@@ -622,7 +622,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand == "Copy")
{
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
if(pChild)
{
KeyEvent aEvent( 0, KEYFUNC_COPY );
@@ -631,7 +631,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand == "Paste")
{
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
if(pChild)
{
KeyEvent aEvent( 0, KEYFUNC_PASTE );
@@ -708,14 +708,14 @@ void BibFrameController_Impl::addStatusListener(
}
else if(aURL.Path == "Cut")
{
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
Edit* pEdit = dynamic_cast<Edit*>( pChild );
if( pEdit )
aEvent.IsEnabled = !pEdit->IsReadOnly() && pEdit->GetSelection().Len();
}
if(aURL.Path == "Copy")
{
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
Edit* pEdit = dynamic_cast<Edit*>( pChild );
if( pEdit )
aEvent.IsEnabled = pEdit->GetSelection().Len() > 0;
@@ -723,7 +723,7 @@ void BibFrameController_Impl::addStatusListener(
else if(aURL.Path == "Paste" )
{
aEvent.IsEnabled = sal_False;
- Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
+ vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
if(pChild)
{
uno::Reference< datatransfer::clipboard::XClipboard > xClip = pChild->GetClipboard();
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index d139d61398b6..7c2ca8d81842 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -166,7 +166,7 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::
{
}
-BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
+BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
BibTabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)),
pDatMan(pMan)
@@ -246,7 +246,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
xCtrlContnr = VCLUnoHelper::CreateControlContainer(pGrid);
- std::vector<Window*> aChildren;
+ std::vector<vcl::Window*> aChildren;
AddControlWithError(lcl_GetColumnName(pMapping, IDENTIFIER_POS), *pIdentifierFT,
sTableErrorString,
@@ -400,7 +400,7 @@ void BibGeneralPage::CommitActiveControl()
}
void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText &rLabel,
- OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<Window*> &rChildren)
+ OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren)
{
const OUString aColumnUIName(rLabel.GetText());
// adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
@@ -426,7 +426,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText
uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
const OUString& rName,
FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex,
- std::vector<Window*>& rChildren)
+ std::vector<vcl::Window*>& rChildren)
{
uno::Reference< awt::XControlModel > xCtrModel;
try
@@ -514,7 +514,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
xCtrWin->setVisible( sal_True );
xControl->setDesignMode( sal_True );
- Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
pWindow->set_grid_top_attach(rLabel.get_grid_top_attach());
pWindow->set_grid_left_attach(rLabel.get_grid_left_attach()+1);
pWindow->set_valign(VCL_ALIGN_CENTER);
@@ -674,7 +674,7 @@ bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
uno::Reference< awt::XControl > xControl( aControls[ nCtrlIndex ], UNO_QUERY );
DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control which is not a control!" );
- Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() );
if( pWindow )
{
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 409ccf58873d..9e96c3343f7b 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -119,17 +119,17 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId,
- sal_Int16& rIndex, std::vector<Window*>& rChildren );
+ sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren );
void AddControlWithError( const OUString& rColumnName, FixedText& rLabel,
OUString& rErrorString,
- const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<Window*>& rChildren );
+ const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren );
protected:
void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts
public:
- BibGeneralPage(Window* pParent, BibDataManager* pDatMan);
+ BibGeneralPage(vcl::Window* pParent, BibDataManager* pDatMan);
virtual ~BibGeneralPage();
inline const OUString& GetErrorString() const;
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 54a0ef09c30d..2a5d07b55fd1 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -176,7 +176,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw
}
}
-BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
+BibToolBar::BibToolBar(vcl::Window* pParent, Link aLink, WinBits nStyle):
ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
aImgLst(BibResId( RID_TOOLBAR_IMGLIST )),
aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index b14c231c7d86..a1e7886a3171 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -148,7 +148,7 @@ class BibToolBar: public ToolBox
public:
- BibToolBar(Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK );
+ BibToolBar(vcl::Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK );
virtual ~BibToolBar();
void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 17:42:35 +0000