Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d73d329b
Kaydet (Commit)
d73d329b
authored
Ara 21, 2011
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
callcatcher: remove unused classes
üst
070eff8c
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
4 additions
and
665 deletions
+4
-665
insdlg.cxx
cui/source/dialogs/insdlg.cxx
+0
-188
insdlg.hxx
cui/source/inc/insdlg.hxx
+0
-38
ctrlbox.hxx
svtools/inc/svtools/ctrlbox.hxx
+1
-1
ctrltool.hxx
svtools/inc/svtools/ctrltool.hxx
+1
-1
stdmenu.hxx
svtools/inc/svtools/stdmenu.hxx
+2
-74
stdmenu.cxx
svtools/source/control/stdmenu.cxx
+0
-246
dlgctrl.hxx
svx/inc/svx/dlgctrl.hxx
+0
-24
dlgctrl.cxx
svx/source/dialog/dlgctrl.cxx
+0
-87
unusedcode.easy
unusedcode.easy
+0
-6
No files found.
cui/source/dialogs/insdlg.cxx
Dosyayı görüntüle @
d73d329b
...
@@ -539,194 +539,6 @@ short SvInsertPlugInDialog::Execute()
...
@@ -539,194 +539,6 @@ short SvInsertPlugInDialog::Execute()
return
nRet
;
return
nRet
;
}
}
// class SvInsertAppletDlg -----------------------------------------------
IMPL_LINK
(
SvInsertAppletDialog
,
BrowseHdl
,
PushButton
*
,
EMPTYARG
)
{
Reference
<
XMultiServiceFactory
>
xFactory
(
::
comphelper
::
getProcessServiceFactory
()
);
if
(
xFactory
.
is
()
)
{
Reference
<
XFilePicker
>
xFilePicker
(
xFactory
->
createInstance
(
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"com.sun.star.ui.dialogs.FilePicker"
)
)
),
UNO_QUERY
);
DBG_ASSERT
(
xFilePicker
.
is
(),
"could not get FilePicker service"
);
Reference
<
XInitialization
>
xInit
(
xFilePicker
,
UNO_QUERY
);
Reference
<
XFilterManager
>
xFilterMgr
(
xFilePicker
,
UNO_QUERY
);
if
(
xInit
.
is
()
&&
xFilePicker
.
is
()
&&
xFilterMgr
.
is
()
)
{
Sequence
<
Any
>
aServiceType
(
1
);
aServiceType
[
0
]
<<=
TemplateDescription
::
FILEOPEN_SIMPLE
;
xInit
->
initialize
(
aServiceType
);
// add filter
try
{
xFilterMgr
->
appendFilter
(
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"Applet"
)
),
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"*.class"
)
)
);
}
catch
(
IllegalArgumentException
&
)
{
DBG_ASSERT
(
0
,
"caught IllegalArgumentException when registering filter
\n
"
);
}
if
(
xFilePicker
->
execute
()
==
ExecutableDialogResults
::
OK
)
{
Sequence
<
OUString
>
aPathSeq
(
xFilePicker
->
getFiles
()
);
INetURLObject
aObj
(
aPathSeq
[
0
]
);
aEdClassfile
.
SetText
(
aObj
.
getName
()
);
aObj
.
removeSegment
();
aEdClasslocation
.
SetText
(
aObj
.
PathToFileName
()
);
}
}
}
return
0
;
}
// -----------------------------------------------------------------------
SvInsertAppletDialog
::
SvInsertAppletDialog
(
Window
*
pParent
,
const
uno
::
Reference
<
embed
::
XStorage
>&
xStorage
)
:
InsertObjectDialog_Impl
(
pParent
,
CUI_RES
(
MD_INSERT_OBJECT_APPLET
),
xStorage
),
aFtClassfile
(
this
,
CUI_RES
(
FT_CLASSFILE
)
),
aEdClassfile
(
this
,
CUI_RES
(
ED_CLASSFILE
)
),
aFtClasslocation
(
this
,
CUI_RES
(
FT_CLASSLOCATION
)
),
aEdClasslocation
(
this
,
CUI_RES
(
ED_CLASSLOCATION
)
),
aBtnClass
(
this
,
CUI_RES
(
BTN_CLASS
)
),
aGbClass
(
this
,
CUI_RES
(
GB_CLASS
)
),
aEdAppletOptions
(
this
,
CUI_RES
(
ED_APPLET_OPTIONS
)
),
aGbAppletOptions
(
this
,
CUI_RES
(
GB_APPLET_OPTIONS
)
),
aOKButton1
(
this
,
CUI_RES
(
1
)
),
aCancelButton1
(
this
,
CUI_RES
(
1
)
),
aHelpButton1
(
this
,
CUI_RES
(
1
)
),
m_pURL
(
0
)
{
FreeResource
();
aBtnClass
.
SetClickHdl
(
LINK
(
this
,
SvInsertAppletDialog
,
BrowseHdl
)
);
}
SvInsertAppletDialog
::
SvInsertAppletDialog
(
Window
*
pParent
,
const
uno
::
Reference
<
embed
::
XEmbeddedObject
>&
xObj
)
:
InsertObjectDialog_Impl
(
pParent
,
CUI_RES
(
MD_INSERT_OBJECT_APPLET
),
uno
::
Reference
<
embed
::
XStorage
>
()
),
aFtClassfile
(
this
,
CUI_RES
(
FT_CLASSFILE
)
),
aEdClassfile
(
this
,
CUI_RES
(
ED_CLASSFILE
)
),
aFtClasslocation
(
this
,
CUI_RES
(
FT_CLASSLOCATION
)
),
aEdClasslocation
(
this
,
CUI_RES
(
ED_CLASSLOCATION
)
),
aBtnClass
(
this
,
CUI_RES
(
BTN_CLASS
)
),
aGbClass
(
this
,
CUI_RES
(
GB_CLASS
)
),
aEdAppletOptions
(
this
,
CUI_RES
(
ED_APPLET_OPTIONS
)
),
aGbAppletOptions
(
this
,
CUI_RES
(
GB_APPLET_OPTIONS
)
),
aOKButton1
(
this
,
CUI_RES
(
1
)
),
aCancelButton1
(
this
,
CUI_RES
(
1
)
),
aHelpButton1
(
this
,
CUI_RES
(
1
)
),
m_pURL
(
0
)
{
m_xObj
=
xObj
;
FreeResource
();
aBtnClass
.
SetClickHdl
(
LINK
(
this
,
SvInsertAppletDialog
,
BrowseHdl
)
);
}
SvInsertAppletDialog
::~
SvInsertAppletDialog
()
{
delete
m_pURL
;
}
short
SvInsertAppletDialog
::
Execute
()
{
short
nRet
=
RET_OK
;
m_aClass
.
Erase
();
m_aCommands
.
Erase
();
sal_Bool
bOK
=
sal_False
;
uno
::
Reference
<
beans
::
XPropertySet
>
xSet
;
if
(
m_xObj
.
is
()
)
{
try
{
if
(
m_xObj
->
getCurrentState
()
==
embed
::
EmbedStates
::
LOADED
)
m_xObj
->
changeState
(
embed
::
EmbedStates
::
RUNNING
);
xSet
=
uno
::
Reference
<
beans
::
XPropertySet
>
(
m_xObj
->
getComponent
(),
uno
::
UNO_QUERY
);
::
rtl
::
OUString
aStr
;
uno
::
Any
aAny
=
xSet
->
getPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCode"
)
)
);
if
(
aAny
>>=
aStr
)
SetClass
(
aStr
);
aAny
=
xSet
->
getPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCodeBase"
)
)
);
if
(
aAny
>>=
aStr
)
SetClassLocation
(
aStr
);
uno
::
Sequence
<
beans
::
PropertyValue
>
aCommands
;
aAny
=
xSet
->
getPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCommands"
)
)
);
if
(
aAny
>>=
aCommands
)
{
SvCommandList
aList
;
aList
.
FillFromSequence
(
aCommands
);
SetAppletOptions
(
aList
.
GetCommands
()
);
}
String
aText
(
CUI_RES
(
STR_EDIT_APPLET
)
);
SetText
(
aText
);
bOK
=
sal_True
;
}
catch
(
uno
::
Exception
&
)
{
OSL_FAIL
(
"No Applet!"
);
}
}
else
{
DBG_ASSERT
(
m_xStorage
.
is
(),
"No storage!"
);
bOK
=
m_xStorage
.
is
();
}
if
(
bOK
&&
(
nRet
=
Dialog
::
Execute
()
)
==
RET_OK
)
{
if
(
!
m_xObj
.
is
()
)
{
::
rtl
::
OUString
aName
;
SvGlobalName
aClassId
(
SO3_APPLET_CLASSID
);
m_xObj
=
aCnt
.
CreateEmbeddedObject
(
aClassId
.
GetByteSequence
(),
aName
);
if
(
m_xObj
->
getCurrentState
()
==
embed
::
EmbedStates
::
LOADED
)
m_xObj
->
changeState
(
embed
::
EmbedStates
::
RUNNING
);
xSet
=
uno
::
Reference
<
beans
::
XPropertySet
>
(
m_xObj
->
getComponent
(),
uno
::
UNO_QUERY
);
}
if
(
m_xObj
.
is
()
)
{
try
{
sal_Bool
bIPActive
=
m_xObj
->
getCurrentState
()
==
embed
::
EmbedStates
::
INPLACE_ACTIVE
;
if
(
bIPActive
)
m_xObj
->
changeState
(
embed
::
EmbedStates
::
RUNNING
);
String
aClassLocation
=
GetClassLocation
();
// Hack, aFileName wird auch fuer Class benutzt
m_aClass
=
GetClass
();
xSet
->
setPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCode"
)
),
makeAny
(
::
rtl
::
OUString
(
m_aClass
)
)
);
::
rtl
::
OUString
tmp
=
aClassLocation
;
::
osl
::
File
::
getFileURLFromSystemPath
(
tmp
,
tmp
);
aClassLocation
=
tmp
;
xSet
->
setPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCodeBase"
)
),
makeAny
(
tmp
)
);
m_aCommands
=
GetAppletOptions
();
uno
::
Sequence
<
beans
::
PropertyValue
>
aCommandSequence
;
Plugin_ImplFillCommandSequence
(
m_aCommands
,
aCommandSequence
);
xSet
->
setPropertyValue
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AppletCommands"
)
),
makeAny
(
aCommandSequence
)
);
if
(
bIPActive
)
m_xObj
->
changeState
(
embed
::
EmbedStates
::
INPLACE_ACTIVE
);
}
catch
(
uno
::
Exception
&
)
{
OSL_FAIL
(
"No Applet!"
);
}
}
}
return
nRet
;
}
SfxInsertFloatingFrameDialog
::
SfxInsertFloatingFrameDialog
(
Window
*
pParent
,
SfxInsertFloatingFrameDialog
::
SfxInsertFloatingFrameDialog
(
Window
*
pParent
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
embed
::
XStorage
>&
xStorage
)
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
embed
::
XStorage
>&
xStorage
)
:
InsertObjectDialog_Impl
(
pParent
,
CUI_RES
(
MD_INSERT_OBJECT_IFRAME
),
xStorage
)
:
InsertObjectDialog_Impl
(
pParent
,
CUI_RES
(
MD_INSERT_OBJECT_IFRAME
),
xStorage
)
...
...
cui/source/inc/insdlg.hxx
Dosyayı görüntüle @
d73d329b
...
@@ -127,44 +127,6 @@ public:
...
@@ -127,44 +127,6 @@ public:
virtual
short
Execute
();
virtual
short
Execute
();
};
};
// class SvInsertAppletDialog --------------------------------------------
class
SvInsertAppletDialog
:
public
InsertObjectDialog_Impl
{
private
:
FixedText
aFtClassfile
;
Edit
aEdClassfile
;
FixedText
aFtClasslocation
;
Edit
aEdClasslocation
;
PushButton
aBtnClass
;
FixedLine
aGbClass
;
MultiLineEdit
aEdAppletOptions
;
FixedLine
aGbAppletOptions
;
OKButton
aOKButton1
;
CancelButton
aCancelButton1
;
HelpButton
aHelpButton1
;
INetURLObject
*
m_pURL
;
String
m_aClass
;
String
m_aCommands
;
String
GetClass
()
const
{
return
aEdClassfile
.
GetText
();
}
String
GetClassLocation
()
const
{
return
aEdClasslocation
.
GetText
();
}
String
GetAppletOptions
()
const
{
return
aEdAppletOptions
.
GetText
();
}
void
SetClass
(
const
String
&
rClass
)
{
aEdClassfile
.
SetText
(
rClass
);
}
void
SetClassLocation
(
const
String
&
rLocation
)
{
aEdClasslocation
.
SetText
(
rLocation
);
}
void
SetAppletOptions
(
const
String
&
rOptions
)
{
aEdAppletOptions
.
SetText
(
rOptions
);
}
DECL_LINK
(
BrowseHdl
,
PushButton
*
);
public
:
SvInsertAppletDialog
(
Window
*
pParent
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
embed
::
XStorage
>&
xStorage
);
SvInsertAppletDialog
(
Window
*
pParent
,
const
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
embed
::
XEmbeddedObject
>&
xObj
);
~
SvInsertAppletDialog
();
virtual
short
Execute
();
};
class
SfxInsertFloatingFrameDialog
:
public
InsertObjectDialog_Impl
class
SfxInsertFloatingFrameDialog
:
public
InsertObjectDialog_Impl
{
{
private
:
private
:
...
...
svtools/inc/svtools/ctrlbox.hxx
Dosyayı görüntüle @
d73d329b
...
@@ -134,7 +134,7 @@ angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden.
...
@@ -134,7 +134,7 @@ angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden.
Querverweise
Querverweise
FontList; FontNameBox; FontSizeBox;
FontStyleMenu
FontList; FontNameBox; FontSizeBox;
--------------------------------------------------------------------------
--------------------------------------------------------------------------
...
...
svtools/inc/svtools/ctrltool.hxx
Dosyayı görüntüle @
d73d329b
...
@@ -56,7 +56,7 @@ Standard-Menus zusammenarbeiten.
...
@@ -56,7 +56,7 @@ Standard-Menus zusammenarbeiten.
Querverweise
Querverweise
class FontNameBox, class FontStyleBox, class FontSizeBox,
class FontNameBox, class FontStyleBox, class FontSizeBox,
class FontNameMenu, class FontS
tyleMenu, class FontS
izeMenu
class FontNameMenu, class FontSizeMenu
--------------------------------------------------------------------------
--------------------------------------------------------------------------
...
...
svtools/inc/svtools/stdmenu.hxx
Dosyayı görüntüle @
d73d329b
...
@@ -69,46 +69,7 @@ zu 10-Sekunden fuer die Erzeugung brauchen koennte).
...
@@ -69,46 +69,7 @@ zu 10-Sekunden fuer die Erzeugung brauchen koennte).
Querverweise
Querverweise
FontList; FontStyleMenu; FontSizeMenu; FontNameBox
FontList; FontSizeMenu; FontNameBox
--------------------------------------------------------------------------
class FontStyleMenu
Beschreibung
Erlaubt die Auswahl eines FontStyles. Mit Fill wird das FontStyleMenu mit
den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden
immer mit eingefuegt (kann sich aber noch aendern, da vielleicht
nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts
umgehen koennen). Mit SetCurStyle()/GetCurStyle() kann der aktuelle Fontstyle
gesetzt/abgefragt werden. Der Stylename muss mit FontList::GetStyleName()
ermittelt werden. Wenn SetCurStyle() mit einem leeren String aufgerufen wird,
wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem Selectaufruf
wird der ausgewaehlte Style automatisch als aktueller gesetzt und wuerde beim
naechsten Aufruf auch als aktueller Style angezeigt werden. Deshalb sollte vor
PopupMenu::Execute() gegebenenfalls mit SetCurStyle() der aktuelle Style
gesetzt werden. Da die Styles vom ausgewaehlten Font abhaengen, sollte
nach einer Aenderung des Fontnamen das Menu mit Fill mit den Styles des
Fonts neu gefuellt werden.
Mit GetCurStyle() kann der ausgewaehlte Style abgefragt
werden. Mit Check wird der Style gecheckt/uncheckt, welcher aktiv
ist. Der Stylename muss mit FontList::GetStyleName() ermittelt werden. Vor
dem Selectaufruf wird der ausgewaehlte Style automatisch gecheckt. Mit
UncheckAllStyles() koennen alle Fontstyles geuncheckt werden (zum Beispiel
fuer DontKnow).
Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein
Select-Handler gesetzt werden, um die Auswahl eines Styles mitzubekommen.
An dieses Menu kann ueber MENU_APPEND weitere Items eingefuegt werden.
Bei Fill werden nur Items entfernt, die die Id zwischen FONTSTYLEMENU_FIRSTID
und FONTSTYLEMENU_LASTID haben.
Querverweise
FontList; FontNameMenu; FontSizeMenu; FontStyleBox
--------------------------------------------------------------------------
--------------------------------------------------------------------------
...
@@ -141,7 +102,7 @@ darstellen, die als Bitmap-Fonts vorhanden sind.
...
@@ -141,7 +102,7 @@ darstellen, die als Bitmap-Fonts vorhanden sind.
Querverweise
Querverweise
FontList; FontNameMenu; FontS
tyleMenu; FontS
izeBox
FontList; FontNameMenu; FontSizeBox
*************************************************************************/
*************************************************************************/
...
@@ -174,39 +135,6 @@ public:
...
@@ -174,39 +135,6 @@ public:
const
Link
&
GetHighlightHdl
()
const
{
return
maHighlightHdl
;
}
const
Link
&
GetHighlightHdl
()
const
{
return
maHighlightHdl
;
}
};
};
// -----------------
// - FontStyleMenu -
// -----------------
#define FONTSTYLEMENU_FIRSTID 62000
#define FONTSTYLEMENU_LASTID 62999
class
SVT_DLLPUBLIC
FontStyleMenu
:
public
PopupMenu
{
private
:
XubString
maCurStyle
;
Link
maSelectHdl
;
Link
maHighlightHdl
;
SVT_DLLPRIVATE
sal_Bool
ImplIsAlreadyInserted
(
const
XubString
&
rStyleName
,
sal_uInt16
nCount
);
public
:
FontStyleMenu
();
virtual
~
FontStyleMenu
();
virtual
void
Select
();
virtual
void
Highlight
();
void
Fill
(
const
XubString
&
rName
,
const
FontList
*
pList
);
void
SetCurStyle
(
const
XubString
&
rStyle
);
const
XubString
&
GetCurStyle
()
const
{
return
maCurStyle
;
}
void
SetSelectHdl
(
const
Link
&
rLink
)
{
maSelectHdl
=
rLink
;
}
const
Link
&
GetSelectHdl
()
const
{
return
maSelectHdl
;
}
void
SetHighlightHdl
(
const
Link
&
rLink
)
{
maHighlightHdl
=
rLink
;
}
const
Link
&
GetHighlightHdl
()
const
{
return
maHighlightHdl
;
}
};
// ----------------
// ----------------
// - FontSizeMenu -
// - FontSizeMenu -
// ----------------
// ----------------
...
...
svtools/source/control/stdmenu.cxx
Dosyayı görüntüle @
d73d329b
...
@@ -125,252 +125,6 @@ void FontNameMenu::SetCurName( const XubString& rName )
...
@@ -125,252 +125,6 @@ void FontNameMenu::SetCurName( const XubString& rName )
// ========================================================================
// ========================================================================
FontStyleMenu
::
FontStyleMenu
()
{
SetMenuFlags
(
GetMenuFlags
()
|
MENU_FLAG_NOAUTOMNEMONICS
);
}
// -----------------------------------------------------------------------
FontStyleMenu
::~
FontStyleMenu
()
{
}
// -----------------------------------------------------------------------
void
FontStyleMenu
::
Select
()
{
sal_uInt16
nCurId
=
GetCurItemId
();
if
(
(
nCurId
>=
FONTSTYLEMENU_FIRSTID
)
&&
(
nCurId
<=
FONTSTYLEMENU_LASTID
)
)
{
maCurStyle
=
GetItemText
(
nCurId
);
maSelectHdl
.
Call
(
this
);
}
else
PopupMenu
::
Select
();
}
// -----------------------------------------------------------------------
void
FontStyleMenu
::
Highlight
()
{
sal_uInt16
nCurId
=
GetCurItemId
();
if
(
(
nCurId
>=
FONTSTYLEMENU_FIRSTID
)
&&
(
nCurId
<=
FONTSTYLEMENU_LASTID
)
)
{
XubString
aTempName
=
maCurStyle
;
maCurStyle
=
GetItemText
(
nCurId
);
maHighlightHdl
.
Call
(
this
);
maCurStyle
=
aTempName
;
}
else
PopupMenu
::
Highlight
();
}
// -----------------------------------------------------------------------
sal_Bool
FontStyleMenu
::
ImplIsAlreadyInserted
(
const
XubString
&
rStyleName
,
sal_uInt16
nCount
)
{
for
(
sal_uInt16
i
=
0
;
i
<
nCount
;
i
++
)
{
if
(
GetItemText
(
i
+
FONTSTYLEMENU_FIRSTID
)
==
rStyleName
)
return
sal_True
;
}
return
sal_False
;
}
// -----------------------------------------------------------------------
void
FontStyleMenu
::
Fill
(
const
XubString
&
rName
,
const
FontList
*
pList
)
{
sal_uInt16
nItemId
=
GetItemId
(
0
);
while
(
(
nItemId
>=
FONTSTYLEMENU_FIRSTID
)
&&
(
nItemId
<=
FONTSTYLEMENU_LASTID
)
)
{
RemoveItem
(
0
);
nItemId
=
GetItemId
(
0
);
}
// Existiert ein Font mit diesem Namen
sal_Handle
hFontInfo
=
pList
->
GetFirstFontInfo
(
rName
);
if
(
hFontInfo
)
{
XubString
aStyleText
;
sal_uInt16
nPos
=
0
;
sal_uInt16
nId
=
FONTSTYLEMENU_FIRSTID
;
FontWeight
eLastWeight
=
WEIGHT_DONTKNOW
;
FontItalic
eLastItalic
=
ITALIC_NONE
;
FontWidth
eLastWidth
=
WIDTH_DONTKNOW
;
sal_Bool
bNormal
=
sal_False
;
sal_Bool
bItalic
=
sal_False
;
sal_Bool
bBold
=
sal_False
;
sal_Bool
bBoldItalic
=
sal_False
;
sal_Bool
bInsert
=
sal_False
;
FontInfo
aInfo
;
while
(
hFontInfo
)
{
aInfo
=
pList
->
GetFontInfo
(
hFontInfo
);
FontWeight
eWeight
=
aInfo
.
GetWeight
();
FontItalic
eItalic
=
aInfo
.
GetItalic
();
FontWidth
eWidth
=
aInfo
.
GetWidthType
();
// Only if the attributes are different, we insert the
// Font to avoid double Entries in different languages
if
(
(
eWeight
!=
eLastWeight
)
||
(
eItalic
!=
eLastItalic
)
||
(
eWidth
!=
eLastWidth
)
)
{
if
(
bInsert
)
{
InsertItem
(
nId
,
aStyleText
,
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
nPos
);
nPos
++
;
nId
++
;
}
if
(
eWeight
<=
WEIGHT_NORMAL
)
{
if
(
eItalic
!=
ITALIC_NONE
)
bItalic
=
sal_True
;
else
bNormal
=
sal_True
;
}
else
{
if
(
eItalic
!=
ITALIC_NONE
)
bBoldItalic
=
sal_True
;
else
bBold
=
sal_True
;
}
// For wrong StyleNames we replace this with the correct once
aStyleText
=
pList
->
GetStyleName
(
aInfo
);
bInsert
=
!
ImplIsAlreadyInserted
(
aStyleText
,
nPos
);
if
(
!
bInsert
)
{
aStyleText
=
pList
->
GetStyleName
(
eWeight
,
eItalic
);
bInsert
=
!
ImplIsAlreadyInserted
(
aStyleText
,
nPos
);
}
eLastWeight
=
eWeight
;
eLastItalic
=
eItalic
;
eLastWidth
=
eWidth
;
}
else
{
if
(
bInsert
)
{
// If we have two names for the same attributes
// we prefer the translated standard names
const
XubString
&
rAttrStyleText
=
pList
->
GetStyleName
(
eWeight
,
eItalic
);
if
(
rAttrStyleText
!=
aStyleText
)
{
XubString
aTempStyleText
=
pList
->
GetStyleName
(
aInfo
);
if
(
rAttrStyleText
==
aTempStyleText
)
aStyleText
=
rAttrStyleText
;
bInsert
=
!
ImplIsAlreadyInserted
(
aStyleText
,
nPos
);
}
}
}
if
(
!
bItalic
&&
(
aStyleText
==
pList
->
GetItalicStr
())
)
bItalic
=
sal_True
;
else
if
(
!
bBold
&&
(
aStyleText
==
pList
->
GetBoldStr
())
)
bBold
=
sal_True
;
else
if
(
!
bBoldItalic
&&
(
aStyleText
==
pList
->
GetBoldItalicStr
())
)
bBoldItalic
=
sal_True
;
hFontInfo
=
pList
->
GetNextFontInfo
(
hFontInfo
);
}
if
(
bInsert
)
{
InsertItem
(
nId
,
aStyleText
,
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
nPos
);
nPos
++
;
nId
++
;
}
// Bestimmte Styles als Nachbildung
if
(
bNormal
)
{
if
(
!
bItalic
)
{
InsertItem
(
nId
,
pList
->
GetItalicStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
nPos
);
nPos
++
;
nId
++
;
}
if
(
!
bBold
)
{
InsertItem
(
nId
,
pList
->
GetBoldStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
nPos
);
nPos
++
;
nId
++
;
}
}
if
(
!
bBoldItalic
)
{
if
(
bNormal
||
bItalic
||
bBold
)
{
InsertItem
(
nId
,
pList
->
GetBoldItalicStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
nPos
);
nPos
++
;
nId
++
;
}
}
}
else
{
// Wenn Font nicht, dann Standard-Styles einfuegen
InsertItem
(
FONTSTYLEMENU_FIRSTID
,
pList
->
GetNormalStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
0
);
InsertItem
(
FONTSTYLEMENU_FIRSTID
+
1
,
pList
->
GetItalicStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
0
);
InsertItem
(
FONTSTYLEMENU_FIRSTID
+
2
,
pList
->
GetBoldStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
0
);
InsertItem
(
FONTSTYLEMENU_FIRSTID
+
3
,
pList
->
GetBoldItalicStr
(),
MIB_RADIOCHECK
|
MIB_AUTOCHECK
,
0
);
}
SetCurStyle
(
maCurStyle
);
}
// -----------------------------------------------------------------------
void
FontStyleMenu
::
SetCurStyle
(
const
XubString
&
rStyle
)
{
maCurStyle
=
rStyle
;
// Menueintrag checken
sal_uInt16
nChecked
=
0
;
sal_uInt16
nItemCount
=
GetItemCount
();
for
(
sal_uInt16
i
=
0
;
i
<
nItemCount
;
i
++
)
{
sal_uInt16
nItemId
=
GetItemId
(
i
);
if
(
(
nItemId
<
FONTSTYLEMENU_FIRSTID
)
||
(
nItemId
>
FONTSTYLEMENU_LASTID
)
)
break
;
if
(
IsItemChecked
(
nItemId
)
)
nChecked
=
nItemId
;
XubString
aText
=
GetItemText
(
nItemId
);
if
(
aText
==
maCurStyle
)
{
CheckItem
(
nItemId
,
sal_True
);
return
;
}
}
if
(
nChecked
)
CheckItem
(
nChecked
,
sal_False
);
}
// ========================================================================
FontSizeMenu
::
FontSizeMenu
()
FontSizeMenu
::
FontSizeMenu
()
:
mpHeightAry
(
NULL
)
:
mpHeightAry
(
NULL
)
,
mnCurHeight
(
100
)
,
mnCurHeight
(
100
)
...
...
svx/inc/svx/dlgctrl.hxx
Dosyayı görüntüle @
d73d329b
...
@@ -134,30 +134,6 @@ public:
...
@@ -134,30 +134,6 @@ public:
void
DoCompletelyDisable
(
sal_Bool
bNew
);
void
DoCompletelyDisable
(
sal_Bool
bNew
);
};
};
/*************************************************************************
|* Control for display and selecton of the angle of the corner points
|* of an object
\************************************************************************/
class
SvxAngleCtl
:
public
SvxRectCtl
{
private
:
void
Initialize
();
protected
:
Font
aFont
;
Size
aFontSize
;
sal_Bool
bPositive
;
public
:
SvxAngleCtl
(
Window
*
pParent
,
const
ResId
&
rResId
);
SvxAngleCtl
(
Window
*
pParent
,
const
ResId
&
rResId
,
Size
aSize
);
void
ChangeMetric
()
{
bPositive
=
!
bPositive
;
}
virtual
void
Paint
(
const
Rectangle
&
rRect
);
};
/*************************************************************************
/*************************************************************************
|* Preview control for the display of bitmaps
|* Preview control for the display of bitmaps
\************************************************************************/
\************************************************************************/
...
...
svx/source/dialog/dlgctrl.cxx
Dosyayı görüntüle @
d73d329b
...
@@ -722,93 +722,6 @@ void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
...
@@ -722,93 +722,6 @@ void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
Invalidate
();
Invalidate
();
}
}
// Constructor without the size parameter
SvxAngleCtl
::
SvxAngleCtl
(
Window
*
pParent
,
const
ResId
&
rResId
)
:
SvxRectCtl
(
pParent
,
rResId
),
aFont
(
Application
::
GetSettings
().
GetStyleSettings
().
GetAppFont
()
)
{
aFontSize
=
Size
(
250
,
400
);
Initialize
();
}
// Constructor with the size parameter
SvxAngleCtl
::
SvxAngleCtl
(
Window
*
pParent
,
const
ResId
&
rResId
,
Size
_aSize
)
:
SvxRectCtl
(
pParent
,
rResId
),
aFont
(
Application
::
GetSettings
().
GetStyleSettings
().
GetAppFont
()
)
{
aFontSize
=
_aSize
;
Initialize
();
}
void
SvxAngleCtl
::
Initialize
()
{
bPositive
=
sal_True
;
aFont
.
SetSize
(
aFontSize
);
aFont
.
SetWeight
(
WEIGHT_NORMAL
);
aFont
.
SetTransparent
(
sal_False
);
SetFont
(
aFont
);
}
// Draws the (mini) coordinate system
void
SvxAngleCtl
::
Paint
(
const
Rectangle
&
)
{
SetLineColor
(
Color
(
COL_BLACK
)
);
// PEN_DOT ???
DrawLine
(
aPtLT
-
Point
(
0
,
0
),
aPtRB
+
Point
(
0
,
0
)
);
DrawLine
(
aPtLB
-
Point
(
0
,
0
),
aPtRT
+
Point
(
0
,
0
)
);
SetLineColor
(
Color
(
COL_BLACK
)
);
DrawLine
(
aPtLM
-
Point
(
0
,
0
),
aPtRM
+
Point
(
0
,
0
)
);
DrawLine
(
aPtMT
-
Point
(
0
,
0
),
aPtMB
+
Point
(
0
,
0
)
);
Point
aDiff
(
aFontSize
.
Width
()
/
2
,
aFontSize
.
Height
()
/
2
);
DrawText
(
aPtLT
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"135"
)
)
);
DrawText
(
aPtLM
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"180"
)
)
);
if
(
bPositive
)
DrawText
(
aPtLB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"225"
)
)
);
else
DrawText
(
aPtLB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"-135"
)
)
);
aDiff
.
X
()
=
aFontSize
.
Width
();
DrawText
(
aPtMT
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"90"
)
)
);
DrawText
(
aPtRT
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"45"
)
)
);
aDiff
.
X
()
=
aDiff
.
X
()
*
3
/
2
;
if
(
bPositive
)
DrawText
(
aPtMB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"270"
)
)
);
else
DrawText
(
aPtMB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"-90"
)
)
);
DrawText
(
aPtRM
-
Point
(
0
,
aDiff
.
Y
()
),
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"0"
)
)
);
aDiff
.
X
()
=
aFontSize
.
Width
()
*
2
;
if
(
bPositive
)
DrawText
(
aPtRB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"315"
)
)
);
else
DrawText
(
aPtRB
-
aDiff
,
UniString
::
CreateFromAscii
(
RTL_CONSTASCII_STRINGPARAM
(
"-45"
)
)
);
}
// Control for editing bitmaps
// Control for editing bitmaps
SvxPixelCtl
::
SvxPixelCtl
(
Window
*
pParent
,
const
ResId
&
rResId
,
sal_uInt16
nNumber
)
:
SvxPixelCtl
::
SvxPixelCtl
(
Window
*
pParent
,
const
ResId
&
rResId
,
sal_uInt16
nNumber
)
:
...
...
unusedcode.easy
Dosyayı görüntüle @
d73d329b
...
@@ -109,8 +109,6 @@ FontCharMap::GetLastChar() const
...
@@ -109,8 +109,6 @@ FontCharMap::GetLastChar() const
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
FontSizeBox::SetUserValue(long, FieldUnit)
FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FontStyleBox::FontStyleBox(Window*, long)
FontStyleMenu::Fill(String const&, FontList const*)
FontStyleMenu::FontStyleMenu()
FormattedField::SetValidateText(String const&, String const*)
FormattedField::SetValidateText(String const&, String const*)
FormatterBase::SetFieldText(String const&, unsigned char)
FormatterBase::SetFieldText(String const&, unsigned char)
GDIMetaFile::IsEqual(GDIMetaFile const&) const
GDIMetaFile::IsEqual(GDIMetaFile const&) const
...
@@ -531,8 +529,6 @@ SvI18NMap_Impl::Remove(SvI18NMapEntry_Impl* const&, unsigned short)
...
@@ -531,8 +529,6 @@ SvI18NMap_Impl::Remove(SvI18NMapEntry_Impl* const&, unsigned short)
SvI18NMap_Impl::Remove(unsigned short, unsigned short)
SvI18NMap_Impl::Remove(unsigned short, unsigned short)
SvInplaceEdit::StopEditing(unsigned char)
SvInplaceEdit::StopEditing(unsigned char)
SvInplaceEdit::SvInplaceEdit(Window*, Point const&, Size const&, String const&, Link const&, Selection const&)
SvInplaceEdit::SvInplaceEdit(Window*, Point const&, Size const&, String const&, Link const&, Selection const&)
SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
SvLBoxButtonData::SvLBoxButtonData()
SvLBoxButtonData::SvLBoxButtonData()
...
@@ -628,8 +624,6 @@ SvxAcceptChgCtr::IsViewPageVisible()
...
@@ -628,8 +624,6 @@ SvxAcceptChgCtr::IsViewPageVisible()
SvxAcceptChgCtr::SvxAcceptChgCtr(Window*, long)
SvxAcceptChgCtr::SvxAcceptChgCtr(Window*, long)
SvxAccessibleTextIndex::IsEditable() const
SvxAccessibleTextIndex::IsEditable() const
SvxAccessibleTextPropertySet::getServiceName()
SvxAccessibleTextPropertySet::getServiceName()
SvxAngleCtl::SvxAngleCtl(Window*, ResId const&)
SvxAngleCtl::SvxAngleCtl(Window*, ResId const&, Size)
SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment