summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx8
-rw-r--r--svx/source/dialog/frmsel.cxx8
-rw-r--r--svx/source/dialog/frmsel.src58
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx3
-rw-r--r--svx/source/inc/frmsel.hrc31
-rw-r--r--svx/source/inc/frmselimpl.hxx2
6 files changed, 34 insertions, 76 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index c7c9af11b270..20808a9a7bce 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -37,7 +37,6 @@
#include "editeng/unolingu.hxx"
#include <svx/dialogs.hrc>
-#include "frmsel.hrc"
namespace svx {
namespace a11y {
@@ -56,17 +55,14 @@ using namespace ::com::sun::star::accessibility;
AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder ) :
- Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ),
mpFrameSel( &rFrameSel ),
meBorder( eBorder ),
maFocusListeners( maFocusMutex ),
maPropertyListeners( maPropertyMutex ),
- maNames( SVX_RES( ARR_TEXTS ) ),
- maDescriptions( SVX_RES(ARR_DESCRIPTIONS ) ),
+ maNames( SVX_RES( RID_SVXSTR_FRMSEL_TEXTS ) ),
+ maDescriptions( SVX_RES(RID_SVXSTR_FRMSEL_DESCRIPTIONS) ),
mnClientId( 0 )
{
- FreeResource();
-
if ( mpFrameSel )
{
mpFrameSel->AddEventListener( LINK( this, AccFrameSelector, WindowEventListener ) );
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 1f045ba4d8e4..e06cf45fc779 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -30,7 +30,6 @@
#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
-#include "frmsel.hrc"
#include <tools/rcid.h>
@@ -205,7 +204,6 @@ FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const
}
FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
- Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ),
mrFrameSel( rFrameSel ),
mpVirDev( VclPtr<VirtualDevice>::Create() ),
maILArrows(),
@@ -236,8 +234,6 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
maChildVec( 8, static_cast< a11y::AccFrameSelector* >( nullptr ) ),
mxChildVec( 8 )
{
- FreeResource();
-
maAllBorders.resize( FRAMEBORDERTYPE_COUNT, nullptr );
maAllBorders[ GetIndexFromFrameBorderType( FrameBorderType::Left ) ] = &maLeft;
maAllBorders[ GetIndexFromFrameBorderType( FrameBorderType::Right ) ] = &maRight;
@@ -319,10 +315,8 @@ void FrameSelectorImpl::InitArrowImageList()
pColorAry1[2] = Color( 255, 0, 255 );
pColorAry2[2] = maBackCol; // magenta -> background
- GetRes( SVX_RES( RID_SVXSTR_BORDER_CONTROL ).SetRT( RSC_RESOURCE ) );
maILArrows.InsertFromHorizontalBitmap(
- SVX_RES( BMP_FRMSEL_ARROWS ), 16, pColorAry1, pColorAry2, 3);
- FreeResource();
+ SVX_RES( RID_SVXBMP_FRMSEL_ARROWS ), 16, pColorAry1, pColorAry2, 3);
DBG_ASSERT( maILArrows.GetImageSize().Height() == maILArrows.GetImageSize().Width(),
"svx::FrameSelectorImpl::InitArrowImageList - images are not squarish" );
mnArrowSize = maILArrows.GetImageSize().Height();
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index 5018d9283d70..16fa657770e5 100644
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.src
@@ -18,42 +18,42 @@
*/
#include <svx/dialogs.hrc>
-#include "frmsel.hrc"
-Resource RID_SVXSTR_BORDER_CONTROL
+StringArray RID_SVXSTR_FRMSEL_TEXTS
{
- StringArray ARR_TEXTS
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right" ; 7; > ;
- < "Diagonal border line from bottom left to top right" ; 8; > ;
- };
+ < "Border setting" ; 0; > ;
+ < "Left border line" ; 1; > ;
+ < "Right border line" ; 2; > ;
+ < "Top border line" ; 3; > ;
+ < "Bottom border line" ; 4; > ;
+ < "Horizontal border line" ; 5; > ;
+ < "Vertical border line" ; 6; > ;
+ < "Diagonal border line from top left to bottom right" ; 7; > ;
+ < "Diagonal border line from bottom left to top right" ; 8; > ;
};
- StringArray ARR_DESCRIPTIONS
+};
+
+StringArray RID_SVXSTR_FRMSEL_DESCRIPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right" ; 7; > ;
- < "Diagonal border line from bottom left to top right" ; 8; > ;
- };
+ < "Border setting" ; 0; > ;
+ < "Left border line" ; 1; > ;
+ < "Right border line" ; 2; > ;
+ < "Top border line" ; 3; > ;
+ < "Bottom border line" ; 4; > ;
+ < "Horizontal border line" ; 5; > ;
+ < "Vertical border line" ; 6; > ;
+ < "Diagonal border line from top left to bottom right" ; 7; > ;
+ < "Diagonal border line from bottom left to top right" ; 8; > ;
};
+};
- Bitmap BMP_FRMSEL_ARROWS { File = "frmsel.png"; };
+Bitmap RID_SVXBMP_FRMSEL_ARROWS
+{
+ File = "frmsel.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 1a8e3c361f74..9c2ad91e5205 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -53,8 +53,7 @@ class AccFrameSelector :
css::accessibility::XAccessibleComponent,
css::accessibility::XAccessibleEventBroadcaster,
css::lang::XServiceInfo
- >,
- public Resource
+ >
{
public:
explicit AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eBorder );
diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc
deleted file mode 100644
index 5ec3567b36db..000000000000
--- a/svx/source/inc/frmsel.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SVX_FRMSEL_HRC
-#define SVX_FRMSEL_HRC
-
-#define ARR_TEXTS 1
-#define ARR_DESCRIPTIONS 2
-
-// image: arrows and markers
-#define BMP_FRMSEL_ARROWS 3
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 73bbe558043a..07e85eda7035 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -95,7 +95,7 @@ private:
typedef std::vector< FrameBorder* > FrameBorderPtrVec;
-struct FrameSelectorImpl : public Resource
+struct FrameSelectorImpl
{
FrameSelector& mrFrameSel; /// The control itself.
ScopedVclPtr<VirtualDevice> mpVirDev; /// For all buffered drawing operations.
generated by cgit (git 2.34.1) at 2025-01-17 17:10:28 +0000