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
a6c18cae
Kaydet (Commit)
a6c18cae
authored
Eyl 13, 2012
tarafından
Noel Power
Kaydeden (comit)
Michael Meeks
Eyl 13, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
targetted container_controls rework.
üst
41747c96
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
23 additions
and
42 deletions
+23
-42
vbacontrol.hxx
oox/inc/oox/ole/vbacontrol.hxx
+7
-2
vbamodule.hxx
oox/inc/oox/ole/vbamodule.hxx
+3
-7
axcontrol.cxx
oox/source/ole/axcontrol.cxx
+1
-1
vbacontrol.cxx
oox/source/ole/vbacontrol.cxx
+0
-0
vbamodule.cxx
oox/source/ole/vbamodule.cxx
+3
-6
vbaproject.cxx
oox/source/ole/vbaproject.cxx
+3
-2
addruno.cxx
sc/source/ui/unoobj/addruno.cxx
+6
-6
tabctrl.hxx
vcl/inc/vcl/tabctrl.hxx
+0
-1
group.cxx
vcl/source/control/group.cxx
+0
-1
tabctrl.cxx
vcl/source/control/tabctrl.cxx
+0
-16
No files found.
oox/inc/oox/ole/vbacontrol.hxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -158,7 +158,13 @@ private:
/** Imports the site models of all embedded controls from the 'f' stream. */
bool
importEmbeddedSiteModels
(
BinaryInputStream
&
rInStrm
);
/* Final processing of all embedded controls after import. */
void
finalizeEmbeddedControls
(
StorageBase
&
rStrg
);
void
finalizeEmbeddedControls
();
/** Moves the control relative to its current position by the passed distance. */
void
moveRelative
(
const
AxPairData
&
rDistance
);
/** Moves all embedded controls from their relative position in this
control to an absolute position in the parent of this control. */
void
moveEmbeddedToAbsoluteParent
();
/** Functor for comparing controls by their tab index. */
static
bool
compareByTabIndex
(
const
VbaFormControlRef
&
rxLeft
,
const
VbaFormControlRef
&
rxRight
);
...
...
@@ -186,7 +192,6 @@ public:
/** Imports the form and its embedded controls, and inserts the form with
all its controls into the passed dialog library. */
void
importForm
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XModel
>&
rxDocModel
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxDialogLib
,
StorageBase
&
rVbaFormStrg
,
const
::
rtl
::
OUString
&
rModuleName
,
...
...
oox/inc/oox/ole/vbamodule.hxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -67,21 +67,17 @@ public:
void
createAndImportModule
(
StorageBase
&
rVbaStrg
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxBasicLib
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameAccess
>&
rxDocObjectNA
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxOleNameOverrides
)
const
;
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameAccess
>&
rxDocObjectNA
)
const
;
/** Creates an empty Basic module in the passed Basic library. */
void
createEmptyModule
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxBasicLib
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameAccess
>&
rxDocObjectNA
)
const
;
private
:
/** Reads and returns the VBA source code from the passed storage. */
::
rtl
::
OUString
readSourceCode
(
StorageBase
&
rVbaStrg
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxOleNameOverrides
)
const
;
void
extractOleOverrideFromAttr
(
const
rtl
::
OUString
&
rAttribute
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
container
::
XNameContainer
>&
rxOleNameOverrides
)
const
;
/** Reads and returns the VBA source code from the passed storage. */
::
rtl
::
OUString
readSourceCode
(
StorageBase
&
rVbaStrg
)
const
;
/** Creates a new Basic module and inserts it into the passed Basic library. */
void
createModule
(
...
...
oox/source/ole/axcontrol.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -625,7 +625,7 @@ OUString ControlModelBase::getServiceName() const
case
API_CONTROL_SPINBUTTON
:
return
CREATE_OUSTRING
(
"com.sun.star.form.component.SpinButton"
);
case
API_CONTROL_SCROLLBAR
:
return
CREATE_OUSTRING
(
"com.sun.star.form.component.ScrollBar"
);
case
API_CONTROL_PROGRESSBAR
:
return
CREATE_OUSTRING
(
"com.sun.star.awt.UnoControlProgressBarModel"
);
case
API_CONTROL_
FRAME
:
return
CREATE_OUSTRING
(
"com.sun.star.awt.UnoFrameModel
"
);
case
API_CONTROL_
GROUPBOX
:
return
CREATE_OUSTRING
(
"com.sun.star.form.component.GroupBox
"
);
case
API_CONTROL_PAGE
:
return
CREATE_OUSTRING
(
"com.sun.star.awt.UnoPageModel"
);
case
API_CONTROL_MULTIPAGE
:
return
CREATE_OUSTRING
(
"com.sun.star.awt.UnoMultiPageModel"
);
case
API_CONTROL_DIALOG
:
return
CREATE_OUSTRING
(
"com.sun.star.awt.UnoControlDialogModel"
);
...
...
oox/source/ole/vbacontrol.cxx
Dosyayı görüntüle @
a6c18cae
This diff is collapsed.
Click to expand it.
oox/source/ole/vbamodule.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -201,10 +201,9 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
void
VbaModule
::
createAndImportModule
(
StorageBase
&
rVbaStrg
,
const
Reference
<
container
::
XNameContainer
>&
rxBasicLib
,
const
Reference
<
container
::
XNameAccess
>&
rxDocObjectNA
,
const
Reference
<
container
::
XNameContainer
>&
rxOleNameOverrides
)
const
const
Reference
<
container
::
XNameAccess
>&
rxDocObjectNA
)
const
{
OUString
aVBASourceCode
=
readSourceCode
(
rVbaStrg
,
rxOleNameOverrides
);
OUString
aVBASourceCode
=
readSourceCode
(
rVbaStrg
);
createModule
(
aVBASourceCode
,
rxBasicLib
,
rxDocObjectNA
);
}
...
...
@@ -214,7 +213,7 @@ void VbaModule::createEmptyModule( const Reference< container::XNameContainer >&
createModule
(
OUString
(),
rxBasicLib
,
rxDocObjectNA
);
}
OUString
VbaModule
::
readSourceCode
(
StorageBase
&
rVbaStrg
,
const
Reference
<
container
::
XNameContainer
>&
rxOleNameOverrides
)
const
OUString
VbaModule
::
readSourceCode
(
StorageBase
&
rVbaStrg
)
const
{
OUStringBuffer
aSourceCode
;
const
static
rtl
::
OUString
sUnmatchedRemovedTag
(
RTL_CONSTASCII_USTRINGPARAM
(
"Rem removed unmatched Sub/End: "
)
);
...
...
@@ -275,8 +274,6 @@ OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, const Reference< cont
}
}
}
else
extractOleOverrideFromAttr
(
aCodeLine
,
rxOleNameOverrides
);
}
else
{
...
...
oox/source/ole/vbaproject.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -455,10 +455,11 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
if
(
xBasicLib
.
is
()
)
{
// #TODO cater for mxOleOverridesSink, like I used to before
// call Basic source code import for each module, boost::[c]ref enforces pass-by-ref
aModules
.
forEachMem
(
&
VbaModule
::
createAndImportModule
,
::
boost
::
ref
(
*
xVbaStrg
),
::
boost
::
cref
(
xBasicLib
),
::
boost
::
cref
(
xDocObjectNA
)
,
::
boost
::
cref
(
mxOleOverridesSink
)
);
::
boost
::
cref
(
xDocObjectNA
)
);
// create empty dummy modules
aDummyModules
.
forEachMem
(
&
VbaModule
::
createEmptyModule
,
...
...
@@ -494,7 +495,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
// create and import the form
Reference
<
XNameContainer
>
xDialogLib
(
createDialogLibrary
(),
UNO_SET_THROW
);
VbaUserForm
aForm
(
mxContext
,
mxDocModel
,
rGraphicHelper
,
bDefaultColorBgr
);
aForm
.
importForm
(
mxDocModel
,
xDialogLib
,
*
xSubStrg
,
aModuleName
,
eTextEnc
);
aForm
.
importForm
(
xDialogLib
,
*
xSubStrg
,
aModuleName
,
eTextEnc
);
}
catch
(
const
Exception
&
)
{
...
...
sc/source/ui/unoobj/addruno.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -192,8 +192,8 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr
}
else
if
(
aNameStr
.
EqualsAscii
(
SC_UNONAME_PERSREPR
)
||
aNameStr
.
EqualsAscii
(
SC_UNONAME_XLA1REPR
)
)
{
::
formula
::
FormulaGrammar
::
AddressConvention
aConv
=
aNameStr
.
EqualsAscii
(
SC_UNONAME_PERS
REPR
)
?
::
formula
::
FormulaGrammar
::
CONV_
OOO
:
::
formula
::
FormulaGrammar
::
CONV_XL_A1
;
::
formula
::
FormulaGrammar
::
AddressConvention
eConv
=
aNameStr
.
EqualsAscii
(
SC_UNONAME_XLA1
REPR
)
?
::
formula
::
FormulaGrammar
::
CONV_
XL_A1
:
::
formula
::
FormulaGrammar
::
CONV_OOO
;
// parse the file format string
rtl
::
OUString
sRepresentation
;
...
...
@@ -215,7 +215,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr
}
// parse the rest like a UI string
bSuccess
=
ParseUIString
(
aUIString
,
a
Conv
);
bSuccess
=
ParseUIString
(
aUIString
,
e
Conv
);
}
}
else
...
...
@@ -270,8 +270,8 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
}
else
if
(
aNameStr
.
EqualsAscii
(
SC_UNONAME_PERSREPR
)
||
aNameStr
.
EqualsAscii
(
SC_UNONAME_XLA1REPR
)
)
{
::
formula
::
FormulaGrammar
::
AddressConvention
eConv
=
aNameStr
.
EqualsAscii
(
SC_UNONAME_
PERS
REPR
)
?
::
formula
::
FormulaGrammar
::
CONV_
OOO
:
::
formula
::
FormulaGrammar
::
CONV_XL_A1
;
::
formula
::
FormulaGrammar
::
AddressConvention
eConv
=
aNameStr
.
EqualsAscii
(
SC_UNONAME_
XLA1
REPR
)
?
::
formula
::
FormulaGrammar
::
CONV_
XL_A1
:
::
formula
::
FormulaGrammar
::
CONV_OOO
;
// generate file format string - always include sheet
String
aFormatStr
;
...
...
@@ -284,7 +284,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
sal_uInt16
nFlags
=
SCA_VALID
;
if
(
eConv
!=
::
formula
::
FormulaGrammar
::
CONV_XL_A1
)
nFlags
|=
SCA_TAB_3D
;
aRange
.
aEnd
.
Format
(
aSecond
,
SCA_VALID
|
SCA_TAB_3D
,
pDoc
,
eConv
);
aRange
.
aEnd
.
Format
(
aSecond
,
nFlags
,
pDoc
,
eConv
);
aFormatStr
.
Append
(
aSecond
);
}
aRet
<<=
rtl
::
OUString
(
aFormatStr
);
...
...
vcl/inc/vcl/tabctrl.hxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -90,7 +90,6 @@ private:
protected
:
using
Window
::
ImplInit
;
SAL_DLLPRIVATE
void
ImplInit
(
Window
*
pParent
,
WinBits
nStyle
);
SAL_DLLPRIVATE
WinBits
ImplInitStyle
(
WinBits
nStyle
);
SAL_DLLPRIVATE
void
ImplLoadRes
(
const
ResId
&
rResId
);
virtual
void
FillLayoutData
()
const
;
...
...
vcl/source/control/group.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -133,7 +133,6 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) :
void
GroupBox
::
ImplDraw
(
OutputDevice
*
pDev
,
sal_uLong
nDrawFlags
,
const
Point
&
rPos
,
const
Size
&
rSize
,
bool
bLayout
)
{
OSL_TRACE
(
"GroupBox::ImplDraw Y %d, X %d"
,
rPos
.
Y
(),
rPos
.
X
()
);
long
nTop
;
long
nTextOff
;
const
StyleSettings
&
rStyleSettings
=
GetSettings
().
GetStyleSettings
();
...
...
vcl/source/control/tabctrl.cxx
Dosyayı görüntüle @
a6c18cae
...
...
@@ -158,18 +158,6 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c
// -----------------------------------------------------------------------
WinBits
TabControl
::
ImplInitStyle
(
WinBits
nStyle
)
{
if
(
!
(
nStyle
&
WB_NOTABSTOP
)
)
nStyle
|=
WB_TABSTOP
;
if
(
!
(
nStyle
&
WB_NOGROUP
)
)
nStyle
|=
WB_GROUP
;
return
nStyle
;
}
// -----------------------------------------------------------------------
void
TabControl
::
ImplInitSettings
(
sal_Bool
bFont
,
sal_Bool
bForeground
,
sal_Bool
bBackground
)
{
...
...
@@ -1482,10 +1470,6 @@ void TabControl::StateChanged( StateChangedType nType )
ImplInitSettings
(
sal_False
,
sal_False
,
sal_True
);
Invalidate
();
}
else
if
(
nType
==
STATE_CHANGE_STYLE
)
{
SetStyle
(
ImplInitStyle
(
GetStyle
()
)
);
}
}
// -----------------------------------------------------------------------
...
...
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