summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-11 10:18:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-03-11 18:35:48 +0100
commit13333b72bc8f0627fb934a25de63c8c789fd725d (patch)
tree42d38666532a7701be64b29516cbe2592cfef9f0
parent3f66a801aeab257705922998e518398d27e4d698 (diff)
remove some unneeded vcl/window.hxx includes
Change-Id: I2b716371e2bebe7390e7f0c7b747140d9f4bdec6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112330 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx1
-rw-r--r--svx/source/inc/fmshimp.hxx3
-rw-r--r--sw/source/core/access/accmap.cxx47
-rw-r--r--sw/source/uibase/utlui/shdwcrsr.cxx1
4 files changed, 2 insertions, 50 deletions
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 95476cafd51e..c8f0a402218f 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -22,7 +22,6 @@
#include <osl/diagnose.h>
#include <com/sun/star/sdbc/DataType.hpp>
#include <comphelper/namedvaluecollection.hxx>
-#include <vcl/window.hxx>
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 23bb34cc3a43..4c296ed820b7 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -36,7 +36,6 @@
#include <com/sun/star/form/runtime/FeatureState.hpp>
#include <tools/diagnose_ex.h>
#include <vcl/timer.hxx>
-#include <vcl/window.hxx>
#include <sfx2/shell.hxx>
#include <svx/svdmark.hxx>
#include <svx/fmsearch.hxx>
@@ -55,6 +54,8 @@
#include <vector>
#include <memory>
+struct ImplSVEvent;
+
typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray;
// catch database exceptions if they occur
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 95c1891057f6..5605d23ca75d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1656,53 +1656,6 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
}
}
-//Merge with DoInvalidateShapeSelection
-/*
-void SwAccessibleMap::DoInvalidateShapeFocus()
-{
- const SwViewShell *pVSh = GetShell();
- const SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pVSh) != nullptr ?
- static_cast< const SwFEShell * >( pVSh ) : nullptr;
- const size_t nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
-
- if( nSelShapes != 1 )
- return;
-
- SwAccessibleObjShape_Impl *pShapes = nullptr;
- SwAccessibleObjShape_Impl *pSelShape = nullptr;
- size_t nShapes = 0;
-
- {
- osl::MutexGuard aGuard( maMutex );
- if( mpShapeMap )
- pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
- }
-
- if( pShapes )
- {
- vcl::Window *pWin = GetShell()->GetWin();
- bool bFocused = pWin && pWin->HasFocus();
- SwAccessibleObjShape_Impl *pShape = pShapes;
- while( nShapes )
- {
- if( pShape->second.is() )
- {
- if( bFocused && pShape >= pSelShape )
- pShape->second->SetState( AccessibleStateType::FOCUSED );
- else
- pShape->second->ResetState( AccessibleStateType::FOCUSED );
- }
-
- --nShapes;
- ++pShape;
- }
-
- delete[] pShapes;
- }
-}
-
-*/
-
SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
mpVSh( pSh ),
mbShapeSelected( false ),
diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx
index 72b313fb7d0d..2a9b2a9f3d99 100644
--- a/sw/source/uibase/utlui/shdwcrsr.cxx
+++ b/sw/source/uibase/utlui/shdwcrsr.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/text/HoriOrientation.hpp>
-#include <vcl/window.hxx>
#include <shdwcrsr.hxx>
using namespace ::com::sun::star;