[Libreoffice-commits] core.git: 5 commits - filter/source oox/source sc/source sc/uiconfig sw/source sw/uiconfig vcl/unx
Caolán McNamara
caolanm at redhat.com
Mon Nov 10 08:16:49 PST 2014
filter/source/graphicfilter/ipsd/ipsd.cxx | 12 ++---
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 39 +++++++++++++---
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 12 ++---
oox/source/crypto/CryptTools.cxx | 8 +--
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 6 +-
sc/uiconfig/scalc/ui/consolidatedialog.ui | 42 ++++++++++++++++--
sc/uiconfig/scalc/ui/insertsheet.ui | 23 ++++++++-
sw/source/ui/table/tautofmt.cxx | 14 +++---
sw/uiconfig/swriter/ui/autoformattable.ui | 2
vcl/unx/generic/gdi/pixmap.cxx | 1
10 files changed, 119 insertions(+), 40 deletions(-)
New commits:
commit e2dde6a4d149301557c18d0bcb474fb187ee09e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 10 15:58:03 2014 +0000
mpPixmap uninitialized in one ctor
Change-Id: Iffa82b96610dd1fe5900ca796af413a116d2dd28
diff --git a/vcl/unx/generic/gdi/pixmap.cxx b/vcl/unx/generic/gdi/pixmap.cxx
index beb5589..c30b9af 100644
--- a/vcl/unx/generic/gdi/pixmap.cxx
+++ b/vcl/unx/generic/gdi/pixmap.cxx
@@ -12,6 +12,7 @@
X11Pixmap::X11Pixmap()
: mpDisplay( NULL )
, mnScreen( 0 )
+, mpPixmap( 0 )
, mnWidth( -1 )
, mnHeight( -1 )
, mnDepth( 0 )
commit 27da3f669859dd57d20b94258243ea57d6f5f098
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 10 14:36:41 2014 +0000
coverity#1202754 Bad bit shift operation
Change-Id: I51e8df896897b122965ada0ced161570d38f0468
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index c95991d..451a4bf 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -356,14 +356,14 @@ bool PSDReader::ImplReadBody()
}
if ( nRunCount & 0x80 ) // a run length packet
{
- if ( nBitCount == -1 ) // bits left in nDat?
- {
- m_rPSD.ReadUChar( nDat );
- nDat ^= 0xff;
- nBitCount = 7;
- }
for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
{
+ if ( nBitCount == -1 ) // bits left in nDat?
+ {
+ m_rPSD.ReadUChar( nDat );
+ nDat ^= 0xff;
+ nBitCount = 7;
+ }
mpWriteAcc->SetPixelIndex( nY, nX, nDat >> nBitCount-- );
if ( ++nX == mpFileHeader->nColumns )
{
commit 17796bfb2593ff988f2ed68f6dc4a36f705f148c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 10 14:30:33 2014 +0000
coverity#1130169 Unchecked return value
Change-Id: I62ed42412a0cafa33ddafe536723f5e336c92a7a
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 4e0d189..f5b0769 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -137,11 +137,11 @@ sal_uInt32 Decrypt::update(vector<sal_uInt8>& output, vector<sal_uInt8>& input,
sal_uInt32 actualInputLength = inputLength == 0 || inputLength > input.size() ? input.size() : inputLength;
#if USE_TLS_OPENSSL
- EVP_DecryptUpdate( &mContext, &output[0], &outputLength, &input[0], actualInputLength );
+ (void)EVP_DecryptUpdate( &mContext, &output[0], &outputLength, &input[0], actualInputLength );
#endif // USE_TLS_OPENSSL
#if USE_TLS_NSS
- PK11_CipherOp( mContext, &output[0], &outputLength, actualInputLength, &input[0], actualInputLength );
+ (void)PK11_CipherOp( mContext, &output[0], &outputLength, actualInputLength, &input[0], actualInputLength );
#endif // USE_TLS_NSS
return static_cast<sal_uInt32>(outputLength);
@@ -185,11 +185,11 @@ sal_uInt32 Encrypt::update(vector<sal_uInt8>& output, vector<sal_uInt8>& input,
sal_uInt32 actualInputLength = inputLength == 0 || inputLength > input.size() ? input.size() : inputLength;
#if USE_TLS_OPENSSL
- EVP_EncryptUpdate( &mContext, &output[0], &outputLength, &input[0], actualInputLength );
+ (void)EVP_EncryptUpdate( &mContext, &output[0], &outputLength, &input[0], actualInputLength );
#endif // USE_TLS_OPENSSL
#if USE_TLS_NSS
- PK11_CipherOp( mContext, &output[0], &outputLength, actualInputLength, &input[0], actualInputLength );
+ (void)PK11_CipherOp( mContext, &output[0], &outputLength, actualInputLength, &input[0], actualInputLength );
#endif // USE_TLS_NSS
return static_cast<sal_uInt32>(outputLength);
commit 735f3a94b92ac93d11f66c3a86edc42e1915b337
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 10 11:31:58 2014 +0000
Related: fdo#85111 put a box around xml filter settings control
and writer->insert->table->autoformat
and calc->data->consolidate
and calc->insert->sheet
Change-Id: I7c89d9f01747a00b906afe3c762b747df6872869
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4c715e5..e3deef3 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1337,23 +1337,36 @@ OUString getApplicationUIName( const OUString& rServiceName )
}
SvxPathControl::SvxPathControl(vcl::Window* pParent)
- : VclVBox(pParent)
+ : Window(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_TABSTOP | WB_DIALOGCONTROL | WB_BORDER)
, bHasBeenShown(false)
{
- m_pHeaderBar = new HeaderBar(this, WB_BOTTOMBORDER);
+ m_pVBox = new VclVBox(this);
+
+ m_pHeaderBar = new HeaderBar(m_pVBox, WB_BOTTOMBORDER);
m_pHeaderBar->set_height_request(GetTextHeight() + 6);
- m_pFocusCtrl = new XMLFilterListBox(this);
+ m_pFocusCtrl = new XMLFilterListBox(m_pVBox, this);
m_pFocusCtrl->set_fill(true);
m_pFocusCtrl->set_expand(true);
+
+ m_pVBox->set_hexpand(true);
+ m_pVBox->set_vexpand(true);
+ m_pVBox->set_expand(true);
+ m_pVBox->set_fill(true);
+ m_pVBox->Show();
}
#define ITEMID_NAME 1
#define ITEMID_TYPE 2
-void SvxPathControl::setAllocation(const Size &rAllocation)
+void SvxPathControl::Resize()
{
- VclVBox::setAllocation(rAllocation);
+ Window::Resize();
+
+ if (!m_pVBox)
+ return;
+
+ m_pVBox->SetSizePixel(GetSizePixel());
if (!bHasBeenShown)
bHasBeenShown = IsReallyShown();
@@ -1362,6 +1375,11 @@ void SvxPathControl::setAllocation(const Size &rAllocation)
{
std::vector<long> aWidths;
m_pFocusCtrl->getPreferredDimensions(aWidths);
+ if (aWidths.empty())
+ {
+ bHasBeenShown = false;
+ return;
+ }
long nFirstColumnWidth = aWidths[1];
m_pHeaderBar->SetItemSize(ITEMID_NAME, nFirstColumnWidth);
m_pHeaderBar->SetItemSize(ITEMID_TYPE, 0xFFFF);
@@ -1370,6 +1388,11 @@ void SvxPathControl::setAllocation(const Size &rAllocation)
}
}
+Size SvxPathControl::GetOptimalSize() const
+{
+ return m_pVBox->GetOptimalSize();
+}
+
SvxPathControl::~SvxPathControl()
{
delete m_pFocusCtrl;
@@ -1383,7 +1406,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPathControl(vcl::Wi
bool SvxPathControl::Notify(NotifyEvent& rNEvt)
{
- bool nRet = VclVBox::Notify(rNEvt);
+ bool nRet = Window::Notify(rNEvt);
if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS )
m_pFocusCtrl->GrabFocus();
@@ -1391,10 +1414,10 @@ bool SvxPathControl::Notify(NotifyEvent& rNEvt)
return nRet;
}
-XMLFilterListBox::XMLFilterListBox(SvxPathControl* pParent)
+XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl)
: SvTabListBox(pParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP)
, mbFirstPaint(true)
- , m_pHeaderBar(pParent->getHeaderBar())
+ , m_pHeaderBar(pPathControl->getHeaderBar())
{
Size aBoxSize( pParent->GetOutputSizePixel() );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 6ed617f..cfa47e8 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -32,19 +32,19 @@
#include "xmlfiltercommon.hxx"
-
-
class HeaderBar;
class XMLFilterListBox;
-class SvxPathControl : public VclVBox
+class SvxPathControl : public vcl::Window
{
private:
bool bHasBeenShown;
+ VclVBox* m_pVBox;
HeaderBar* m_pHeaderBar;
XMLFilterListBox* m_pFocusCtrl;
protected:
- virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
+ virtual void Resize() SAL_OVERRIDE;
+ virtual Size GetOptimalSize() const SAL_OVERRIDE;
public:
SvxPathControl(vcl::Window* pParent);
HeaderBar* getHeaderBar() { return m_pHeaderBar; }
@@ -54,8 +54,6 @@ public:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
-
-
class HeaderBar;
class XMLFilterListBox : public SvTabListBox
@@ -70,7 +68,7 @@ private:
OUString getEntryString( const filter_info_impl* pInfo ) const;
public:
- XMLFilterListBox(SvxPathControl* pParent);
+ XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl);
/** adds a new filter info entry to the ui filter list */
void addFilterEntry( const filter_info_impl* pInfo );
diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui
index 920edb8..deec922 100644
--- a/sc/uiconfig/scalc/ui/consolidatedialog.ui
+++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="ConsolidateDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -95,6 +95,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -105,11 +107,13 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Consolidation ranges:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">consareas</property>
+ <property name="mnemonic_widget">consareas:border</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -134,10 +138,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkTreeView" id="consareas">
+ <object class="GtkTreeView" id="consareas:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -151,6 +157,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -181,6 +189,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -194,6 +204,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -208,12 +220,16 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -232,6 +248,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -245,6 +263,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -259,12 +279,16 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -308,6 +332,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -322,6 +348,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -336,6 +364,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -396,6 +426,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -412,6 +444,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui
index a156e9e..453cd57 100644
--- a/sc/uiconfig/scalc/ui/insertsheet.ui
+++ b/sc/uiconfig/scalc/ui/insertsheet.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -231,6 +231,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -245,6 +247,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -258,6 +262,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -272,6 +278,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -338,6 +346,7 @@
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -348,7 +357,7 @@
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="tables">
+ <object class="GtkTreeView" id="tables:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -359,7 +368,7 @@
</object>
</child>
<child internal-child="accessible">
- <object class="AtkObject" id="tables-atkobject">
+ <object class="AtkObject" id="tables:border-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Tables in file</property>
</object>
</child>
@@ -369,6 +378,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -387,6 +398,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -404,12 +417,16 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index fc85c65..0c1a1a1 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -47,7 +47,7 @@ using namespace com::sun::star;
class AutoFmtPreview : public vcl::Window
{
public:
- AutoFmtPreview(vcl::Window* pParent);
+ AutoFmtPreview(vcl::Window* pParent, WinBits nStyle);
virtual ~AutoFmtPreview();
void NotifyChange( const SwTableAutoFmt& rNewData );
@@ -486,8 +486,8 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl)
}
IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
-AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) :
- Window ( pParent ),
+AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
+ Window ( pParent, nStyle ),
aCurData ( OUString() ),
aVD ( *this ),
aScriptedText ( aVD ),
@@ -508,9 +508,13 @@ AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) :
Init();
}
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
- return new AutoFmtPreview(pParent);
+ WinBits nWinStyle = 0;
+ OString sBorder = VclBuilder::extractCustomProperty(rMap);
+ if (!sBorder.isEmpty())
+ nWinStyle |= WB_BORDER;
+ return new AutoFmtPreview(pParent, nWinStyle);
}
void AutoFmtPreview::Resize()
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index dcfc1bd..9855f08 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -158,7 +158,7 @@
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="formatlb">
+ <object class="GtkTreeView" id="formatlb:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
commit 7546afda22e2af40e45b533f17bd8aeaacaa100a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 10 11:08:06 2014 +0000
coverity#1242526 silence Arguments in wrong order
Change-Id: I6b05747772c324c6ab285082b3a6de4cadabe0aa
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index b1d1b5b..db7790c 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -320,8 +320,10 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe
ScAddress aCellPos( static_cast<SCCOL>(rColInfo.nDocIndex), static_cast<SCROW>(rRowInfo.nDocIndex), mpTableInfo->GetTab() );
if ( rColInfo.bIsHeader || rRowInfo.bIsHeader )
{
- ScAccessiblePreviewHeaderCell* pHeaderCell = new ScAccessiblePreviewHeaderCell( this, mpViewShell, aCellPos,
- rRowInfo.bIsHeader, rColInfo.bIsHeader, nNewIndex );
+ const bool bRotatedColHeader = rRowInfo.bIsHeader;
+ const bool bRotatedRowHeader = rColInfo.bIsHeader;
+ ScAccessiblePreviewHeaderCell* pHeaderCell = new ScAccessiblePreviewHeaderCell(this, mpViewShell, aCellPos,
+ bRotatedColHeader, bRotatedRowHeader, nNewIndex);
xRet = pHeaderCell;
pHeaderCell->Init();
}
More information about the Libreoffice-commits
mailing list