summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/vcl/edit.hxx1
-rw-r--r--vcl/inc/vcl/fixed.hxx1
-rw-r--r--vcl/inc/vcl/svapp.hxx1
-rw-r--r--vcl/inc/window.h2
-rw-r--r--vcl/source/app/brand.cxx37
-rw-r--r--vcl/source/app/svapp.cxx7
-rw-r--r--vcl/source/control/edit.cxx19
-rw-r--r--vcl/source/control/fixed.cxx19
-rw-r--r--vcl/source/window/window.cxx8
9 files changed, 0 insertions, 95 deletions
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 178e3d8ceff9..434e4281e44b 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -149,7 +149,6 @@ public:
Edit( Window* pParent, WinBits nStyle = WB_BORDER );
Edit( Window* pParent, const ResId& rResId );
- Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation );
virtual ~Edit();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index efa5f92f7701..c45762f867d7 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -61,7 +61,6 @@ protected:
public:
FixedText( Window* pParent, WinBits nStyle = 0 );
FixedText( Window* pParent, const ResId& rResId );
- FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation );
~FixedText();
virtual void Paint( const Rectangle& rRect );
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index e3e0779810b3..ef929853dabc 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -261,7 +261,6 @@ public:
static void SetAppName( const String& rUniqueName );
static String GetAppName();
static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
- static bool LoadBrandSVG( const char *pName, BitmapEx &rBitmap );
// default name of the application for message dialogs and printing
static void SetDisplayName( const OUString& rDisplayName );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e6b669d63b0f..493863d9a1be 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -391,8 +391,6 @@ public:
mbIsInTaskPaneList:1,
mbToolbarFloatingWindow:1,
mbCallHandlersDuringInputDisabled:1,
- mbDisableAccessibleLabelForRelation:1,
- mbDisableAccessibleLabeledByRelation:1,
mbHelpTextDynamic:1,
mbFakeFocusSet:1,
mbHexpand:1,
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 50b606e68266..007496a604ed 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -45,19 +45,6 @@ namespace {
loadPng( rBaseDir + "/program/edition" + rName, rBitmap) ||
loadPng( rBaseDir + "/program" + rName, rBitmap);
}
- static bool loadSvg( const OUString & rPath, BitmapEx &rBitmap)
- {
- INetURLObject aObj( rPath );
- SvgData aSvgData(aObj.PathToFileName());
- rBitmap = aSvgData.getReplacement();
- return !rBitmap.IsEmpty();
- }
- static bool tryLoadSvg( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap )
- {
- return
- loadSvg( rBaseDir + "/program/edition" + rName, rBitmap) ||
- loadSvg( rBaseDir + "/program" + rName, rBitmap);
- }
}
bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
@@ -86,28 +73,4 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
return false;
}
-bool Application::LoadBrandSVG (const char *pName, BitmapEx &rBitmap)
-{
- OUString aBaseDir( "$BRAND_BASE_DIR");
- rtl::Bootstrap::expandMacros( aBaseDir );
- rtl::OUString aBaseName( "/" + rtl::OUString::createFromAscii( pName ) );
- rtl::OUString aSvg( ".svg" );
-
- rtl_Locale *pLoc = NULL;
- osl_getProcessLocale (&pLoc);
- LanguageTag aLanguageTag( *pLoc);
-
- ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings());
- for (size_t i=0; i < aFallbacks.size(); ++i)
- {
- if (tryLoadSvg( aBaseDir, aBaseName + "-" + aFallbacks[i] + aSvg, rBitmap))
- return true;
- }
-
- if (tryLoadSvg( aBaseDir, aBaseName + aSvg, rBitmap))
- return true;
-
- return false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 90166eb390e8..f884d568ab42 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1647,13 +1647,6 @@ void Application::SetFilterHdl( const Link& rLink )
// -----------------------------------------------------------------------
-const Link& Application::GetFilterHdl()
-{
- return ImplGetSVData()->maGDIData.mpGrfConverter->GetFilterHdl();
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool ImplCallHotKey( const KeyCode& rKeyCode )
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8f19c3c75370..f1cbc95776e9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -253,25 +253,6 @@ bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
// -----------------------------------------------------------------------
-Edit::Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ) :
- Control( WINDOW_EDIT )
-{
- ImplInitEditData();
- rResId.SetRT( RSC_EDIT );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
- if ( bDisableAccessibleLabeledByRelation )
- ImplGetWindowImpl()->mbDisableAccessibleLabeledByRelation = sal_True;
-
- // Derived MultiLineEdit takes care to call Show only after MultiLineEdit
- // ctor has already started:
- if ( !(nStyle & WB_HIDE) && rResId.GetRT() != RSC_MULTILINEEDIT )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
Edit::~Edit()
{
delete mpDDInfo;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index f1d19571e0c3..b6a4d1068701 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -175,25 +175,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
// -----------------------------------------------------------------------
-FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation )
- : Control( WINDOW_FIXEDTEXT )
- , m_nMaxWidthChars(-1)
- , m_nMinWidthChars(-1)
- , m_pMnemonicWindow(NULL)
-{
- rResId.SetRT( RSC_TEXT );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
- if ( bDisableAccessibleLabelForRelation )
- ImplGetWindowImpl()->mbDisableAccessibleLabelForRelation = sal_True;
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
{
sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_ENDELLIPSIS;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 31d3a4808be9..47437ddb9765 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -711,8 +711,6 @@ void Window::ImplInitWindowData( WindowType nType )
mpWindowImpl->mbIsInTaskPaneList = sal_False; // sal_True: window was added to the taskpanelist in the topmost system window
mpWindowImpl->mnNativeBackground = 0; // initialize later, depends on type
mpWindowImpl->mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled
- mpWindowImpl->mbDisableAccessibleLabelForRelation = sal_False; // sal_True: do not set LabelFor relation on accessible objects
- mpWindowImpl->mbDisableAccessibleLabeledByRelation = sal_False; // sal_True: do not set LabeledBy relation on accessible objects
mpWindowImpl->mbHelpTextDynamic = sal_False; // sal_True: append help id in HELP_DEBUG case
mpWindowImpl->mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus.
mpWindowImpl->mbHexpand = false;
@@ -9011,9 +9009,6 @@ Window* Window::GetAccessibleRelationMemberOf() const
Window* Window::getAccessibleRelationLabelFor() const
{
- if (mpWindowImpl->mbDisableAccessibleLabelForRelation)
- return NULL;
-
if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabelForWindow)
return mpWindowImpl->mpAccessibleInfos->pLabelForWindow;
@@ -9035,9 +9030,6 @@ Window* Window::GetAccessibleRelationLabelFor() const
Window* Window::GetAccessibleRelationLabeledBy() const
{
- if (mpWindowImpl->mbDisableAccessibleLabeledByRelation)
- return NULL;
-
if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabeledByWindow)
return mpWindowImpl->mpAccessibleInfos->pLabeledByWindow;
generated by cgit (git 2.34.1) at 2025-02-23 12:03:33 +0000