bean/com/sun/star/comp/beans/JavaWindowPeerFake.java | 4 +-
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 8 ++---
bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 2 -
bean/com/sun/star/comp/beans/OOoBean.java | 8 ++---
cui/source/customize/cfg.cxx | 21 +++++++-------
cui/source/inc/cfg.hxx | 24 ++++++++--------
sc/inc/fillinfo.hxx | 11 ++-----
7 files changed, 37 insertions(+), 41 deletions(-)
New commits:
commit 9813516d5e704c5949bd0010874ad115d57218dc
Author: Noel Grandin <n...@peralex.com>
Date: Tue Oct 28 10:49:33 2014 +0200
Revert some changes that affected the bean/com/sun/star/comp API
from commits
8583da1e934a49791ef8d86668f3d5c3c5dae1d7
"java: remove unused fields"
68cd011c907d00493bf2bfde531c1e244819596b
"java: reduce scope, make some methods private"
da677dfd59c2b551f3335ee0a5d5dfb33f9869c5
"java: reduce scope, make fields private"
e701b3f732fa7f70cb273183e9ae8dbfd840f5e4
"java: reduce scope, make constants private"
Change-Id: I7fe0381c0e17b41bad2e4256c5511fe1f7863498
diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 2467993..1c39e06 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -28,8 +28,8 @@ import com.sun.star.awt.*;
class JavaWindowPeerFake
implements XSystemDependentWindowPeer, XWindowPeer
{
- private int localSystemType;
- private Any wrappedHandle;
+ protected int localSystemType;
+ protected Any wrappedHandle;
/** Create the faked window peer.
* @param _hWindow the system handle to the window.
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 7174dca..c81796d 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -47,9 +47,9 @@ import com.sun.star.lib.util.NativeLibraryLoader;
public class LocalOfficeConnection
implements OfficeConnection
{
- private static final String OFFICE_APP_NAME = "soffice";
-
- private static final String OFFICE_ID_SUFFIX = "_Office";
+ public static final String OFFICE_APP_NAME = "soffice";
+ public static final String OFFICE_LIB_NAME = "officebean";
+ public static final String OFFICE_ID_SUFFIX = "_Office";
private Process mProcess;
private XComponentContext mContext;
@@ -745,7 +745,7 @@ public class LocalOfficeConnection
private java.io.InputStream m_in;
private java.io.PrintStream m_print;
- private StreamProcessor(final java.io.InputStream in, final
java.io.PrintStream out)
+ public StreamProcessor(final java.io.InputStream in, final
java.io.PrintStream out)
{
super("StreamProcessor");
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index d481fbf..b8b493e 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -253,7 +253,7 @@ public class LocalOfficeWindow
* The second NamedValue has the name "XEMBED" and the value is true,
when the XEmbed
* protocol shall be used fore embedding the native Window.
*/
- private Any getWrappedWindowHandle()
+ protected Any getWrappedWindowHandle()
{
NamedValue window = new NamedValue(
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 384ad60..04abd76 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -803,7 +803,7 @@ public class OOoBean
@throws NoDocumentException
if no document is loaded
*/
- private void storeToURL(
+ public void storeToURL(
final String aURL,
final com.sun.star.beans.PropertyValue aArguments[] )
throws
@@ -1041,7 +1041,7 @@
xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible setAllBarsVisible}.
*/
- private void applyToolVisibilities()
+ protected void applyToolVisibilities()
{
bIgnoreVisibility = true;
setMenuBarVisible( bMenuBarVisible );
@@ -1061,7 +1061,7 @@
xLayoutManager.showElement("private:resource/menubar/menubar");
which can be obtained from a frame, to control toolbars. See also
{@link #setAllBarsVisible}.
*/
- private boolean setToolVisible( String aProperty, String aResourceURL,
+ protected boolean setToolVisible( String aProperty, String aResourceURL,
boolean bOldValue, boolean bNewValue )
throws
@@ -1329,7 +1329,7 @@
xLayoutManager.showElement("private:resource/menubar/menubar");
a new array is created, aArgument added and the new
array returned.
*/
- private com.sun.star.beans.PropertyValue[] addArgument(
+ protected com.sun.star.beans.PropertyValue[] addArgument(
com.sun.star.beans.PropertyValue aArguments[],
final com.sun.star.beans.PropertyValue aArgument )
{
commit 9f743f9e474ddfc9e0d2b8b0ad6c2aaa4ab2bc04
Author: Noel Grandin <n...@peralex.com>
Date: Tue Oct 28 10:24:35 2014 +0200
cid#1242780 Uninitialized pointer field
Change-Id: I6478f8f2ead1d87365f84aacdfef2bdcccd61248
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index aeb08d8..f55e115 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2579,6 +2579,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
vcl::Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
: ModalDialog(pParent, "MoveMenuDialog", "cui/ui/movemenu.ui")
+ , mpEntries(0)
, bModified(false)
{
get(m_pMenuBox, "namebox");
commit dcbe265f7e23fac9d6604b8462f4cdf355a64061
Author: Noel Grandin <n...@peralex.com>
Date: Tue Oct 28 10:23:04 2014 +0200
rename class field pEntries to mpEntries
Change-Id: Iea8643dfa472a663023afb57654fccdda85ca601
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6c2b3ff..aeb08d8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2594,7 +2594,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
SvxConfigEntry* pEntry;
SvTreeListEntry* pLBEntry;
- pEntries = new SvxEntries();
+ mpEntries = new SvxEntries();
SvxEntries::const_iterator iter = entries->begin();
while ( iter != entries->end() )
@@ -2603,7 +2603,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
pLBEntry =
m_pMenuListBox->InsertEntry( stripHotKey( pEntry->GetName() )
);
pLBEntry->SetUserData( pEntry );
- pEntries->push_back( pEntry );
+ mpEntries->push_back( pEntry );
if ( pEntry == selection )
{
@@ -2619,7 +2619,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
OUString prefix = CUI_RES( RID_SVXSTR_NEW_MENU );
OUString newname = generateCustomName( prefix, entries );
- OUString newurl = generateCustomMenuURL( pEntries );
+ OUString newurl = generateCustomMenuURL( mpEntries );
SvxConfigEntry* pNewEntryData =
new SvxConfigEntry( newname, newurl, true );
@@ -2632,7 +2632,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
pNewMenuEntry->SetUserData( pNewEntryData );
- pEntries->push_back( pNewEntryData );
+ mpEntries->push_back( pNewEntryData );
m_pMenuNameEdit->SetText( newname );
m_pMenuNameEdit->SetModifyHdl(
@@ -2786,25 +2786,25 @@ SvxConfigEntry::SvxConfigEntry( const OUString&
rDisplayName,
, bIsParentData( bParentData )
, bIsVisible( true )
, nStyle( 0 )
- , pEntries( 0 )
+ , mpEntries( 0 )
{
if (bPopUp)
{
- pEntries = new SvxEntries();
+ mpEntries = new SvxEntries();
}
}
SvxConfigEntry::~SvxConfigEntry()
{
- if ( pEntries != NULL )
+ if ( mpEntries != NULL )
{
- SvxEntries::const_iterator iter = pEntries->begin();
+ SvxEntries::const_iterator iter = mpEntries->begin();
- for ( ; iter != pEntries->end(); ++iter )
+ for ( ; iter != mpEntries->end(); ++iter )
{
delete *iter;
}
- delete pEntries;
+ delete mpEntries;
}
}
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index ebbff4a..2079666 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -214,11 +214,11 @@ class SvxConfigEntry
private:
/// common properties
- sal_uInt16 nId;
- OUString aHelpText;
- OUString aLabel;
- OUString aCommand;
- OUString aHelpURL;
+ sal_uInt16 nId;
+ OUString aHelpText;
+ OUString aLabel;
+ OUString aCommand;
+ OUString aHelpURL;
bool bPopUp;
bool bStrEdited;
@@ -233,7 +233,7 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::graphic::XGraphic > xBackupGraphic;
- SvxEntries *pEntries;
+ SvxEntries *mpEntries;
public:
@@ -252,7 +252,7 @@ public:
bIsParentData( false ),
bIsVisible( true ),
nStyle( 0 ),
- pEntries( 0 )
+ mpEntries( 0 )
{}
~SvxConfigEntry();
@@ -279,9 +279,9 @@ public:
bool IsBinding() const { return !bPopUp; }
bool IsSeparator() const { return nId == 0; }
- SvxEntries* GetEntries() const { return pEntries; }
- void SetEntries( SvxEntries* entries ) { pEntries = entries; }
- bool HasEntries() const { return pEntries != NULL; }
+ SvxEntries* GetEntries() const { return mpEntries; }
+ void SetEntries( SvxEntries* entries ) { mpEntries = entries; }
+ bool HasEntries() const { return mpEntries != NULL; }
void SetMain( bool bValue = true ) { bIsMain = bValue; }
bool IsMain() { return bIsMain; }
@@ -501,7 +501,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
PushButton* m_pMoveUpButton;
PushButton* m_pMoveDownButton;
- SvxEntries* pEntries;
+ SvxEntries* mpEntries;
SvTreeListEntry* pNewMenuEntry;
bool bModified;
@@ -518,7 +518,7 @@ public:
virtual ~SvxMainMenuOrganizerDialog ();
- SvxEntries* GetEntries() { return pEntries;}
+ SvxEntries* GetEntries() { return mpEntries;}
void SetEntries( SvxEntries* );
SvxConfigEntry* GetSelectedEntry();
};
commit 8e156ef6d8a236a49303b12a66ac6cae1ccd567c
Author: Noel Grandin <n...@peralex.com>
Date: Tue Oct 28 10:13:11 2014 +0200
cid#738785 Uninitialized pointer field
Change-Id: I5689435a2522e5df64c3798457e4dd2355730236
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 1db76d9..2af32c1 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -115,9 +115,9 @@ struct CellInfo : boost::noncopyable
ScShadowPart eHShadowPart : 4; // shadow
effective for drawing
ScShadowPart eVShadowPart : 4;
- sal_uInt8 nClipMark;
- sal_uInt16 nWidth;
- sal_uInt8 nRotateDir;
+ sal_uInt8 nClipMark;
+ sal_uInt16 nWidth;
+ sal_uInt8 nRotateDir;
bool bMarked : 1;
bool bEmptyCellText : 1;
@@ -132,11 +132,6 @@ struct CellInfo : boost::noncopyable
bool bHideGrid : 1; // output-internal
bool bEditEngine : 1; // output-internal
- CellInfo():
- pColorScale(NULL),
- pDataBar(NULL),
- pIconSet(NULL) {}
-
~CellInfo()
{
delete pColorScale;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
