[Libreoffice-commits] .: sal/inc

2012-03-12 Thread Josh Heidenreich
 sal/inc/osl/file.hxx |   16 
 1 file changed, 16 deletions(-)

New commits:
commit bde32dc95d33943e301bd165955655eb02e1e223
Author: Josh Heidenreich 
Date:   Tue Mar 13 16:02:18 2012 +1030

Removed FileStatus::isFile. Use ::isRegular instead.

See:
https://bugs.freedesktop.org/show_bug.cgi?id=44982#c6
https://bugs.freedesktop.org/show_bug.cgi?id=44982#c7

for why.

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 2cc43d0..16f7a06 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -733,22 +733,6 @@ public:
 return static_cast< Type >(_aStatus.eType);
 }
 
-/** Is it a file?
-This method returns True for both regular files, and links.
-
-@return
-True if it's a file, False otherwise.
-
-@see getFileType
-@see isRegular
-@see isLink
-@since LibreOffice 3.6
-*/
-inline sal_Bool isFile() const
-{
-return ( getFileType() == Regular || getFileType() == Link );
-}
-
 /** Is it a directory?
 This method returns True for both directories, and volumes.
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: autogen.sh

2012-03-12 Thread Josh Heidenreich
 autogen.sh |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6635337181c3c3530ceaa2fb49330c2b152107d7
Author: Josh Heidenreich 
Date:   Tue Mar 13 08:57:16 2012 +1030

Fix authgen.sh to not clobber autogen.lastrun when using --help

Fix also works for -h and -?

diff --git a/autogen.sh b/autogen.sh
index 2935619..78a6f67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,6 +86,14 @@ sub invalid_distro($$)
 closedir ($dirh);
 }
 
+# Handle help arguments first, so we don't clobber autogen.lastrun
+for my $arg (@ARGV) {
+if ($arg =~ /^(--help|-h|-\?)$/) {
+system ("./configure --help");
+exit;
+}
+}
+
 my @cmdline_args = ();
 if (!@ARGV) {
 my $lastrun = "autogen.lastrun";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - sal/inc

2012-03-08 Thread Josh Heidenreich
 sal/inc/osl/file.hxx |   58 +++
 1 file changed, 58 insertions(+)

New commits:
commit af5cc38cac0defcfc36796915e13ddd5969a7108
Author: Josh Heidenreich 
Date:   Thu Mar 8 14:29:23 2012 +1030

sal file.hxx documentation

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index eb25e63..0ad8922 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -739,6 +739,7 @@ public:
 @see getFileType
 @see isRegular
 @see isLink
+@since 3.6
 */
 inline sal_Bool isFile() const
 {
@@ -752,6 +753,7 @@ public:
 True if it's a directory, False otherwise.
 
 @see getFileType
+@since 3.6
 */
 inline sal_Bool isDirectory() const
 {
@@ -766,6 +768,7 @@ public:
 @see getFileType
 @see isFile
 @see isLink
+@since 3.6
 */
 inline sal_Bool isRegular() const
 {
@@ -778,6 +781,7 @@ public:
 True if it's a link, False otherwise.
 
 @see getFileType
+@since 3.6
 */
 inline sal_Bool isLink() const
 {
commit b64352905ff5fc64e3b2d800766dcfd19b28f533
Author: Josh Heidenreich 
Date:   Thu Mar 8 09:07:16 2012 +1030

Added FileStatus methods isFile, isDirectory, isRegular, isLink

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 8c97750..eb25e63 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -730,6 +730,60 @@ public:
 return (_aStatus.uValidFields & osl_FileStatus_Mask_Type) ?  (Type) 
_aStatus.eType : Unknown;
 }
 
+/** Is it a file?
+This method returns True for both regular files, and links.
+
+@return
+True if it's a file, False otherwise.
+
+@see getFileType
+@see isRegular
+@see isLink
+*/
+inline sal_Bool isFile() const
+{
+return ( getFileType() == Regular || getFileType() == Link );
+}
+
+/** Is it a directory?
+This method returns True for both directories, and volumes.
+
+@return
+True if it's a directory, False otherwise.
+
+@see getFileType
+*/
+inline sal_Bool isDirectory() const
+{
+return ( getFileType() == Directory || getFileType() == Volume );
+}
+
+/** Is it a regular file?
+
+@return
+True if it's a regular file, False otherwise.
+
+@see getFileType
+@see isFile
+@see isLink
+*/
+inline sal_Bool isRegular() const
+{
+return ( getFileType() == Regular );
+}
+
+/** Is it a link?
+
+@return
+True if it's a link, False otherwise.
+
+@see getFileType
+*/
+inline sal_Bool isLink() const
+{
+return ( getFileType() == Link );
+}
+
 /** Get the file attributes.
 
 @return
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: bin/find-german-comments

2012-03-06 Thread Josh Heidenreich
 bin/find-german-comments |   18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

New commits:
commit aedb86399dca3be9c636267104d0893ffc17aca3
Author: Philipp Weissenbacher 
Date:   Tue Mar 6 21:48:52 2012 +0100

Add option to only list filenames

This adds the argument -f (--filenames-only), which only prints the
filenames of files containing German comments.
I personally scan the whole file for German strings anyway, as we do
not find German strings with less than 4 chars. So there's not so
much use in printing the found strings.

diff --git a/bin/find-german-comments b/bin/find-german-comments
index 1538c6d..e0ce382 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -40,6 +40,8 @@ class Parser:
 op.set_usage("%prog [options] \n\n" +
 "Searches for german comments in cxx/hxx source files inside a 
given root\n" +
 "directory recursively.")
+op.add_option("-f", "--filenames-only", action="store_true", 
dest="filenames_only", default=False,
+help="Only print the filenames of files containing German 
comments")
 op.add_option("-v", "--verbose", action="store_true", dest="verbose", 
default=False,
 help="Turn on verbose mode (print progress to stderr)")
 self.options, args = op.parse_args()
@@ -139,9 +141,19 @@ class Parser:
 """
 checks each comment in a file
 """
-for linenum, s in self.get_comments(path):
-if self.is_german(s):
-print "%s:%s: %s" % (path, linenum, s)
+if not self.options.filenames_only:
+for linenum, s in self.get_comments(path):
+if self.is_german(s):
+print "%s:%s: %s" % (path, linenum, s)
+else:
+fnames = set([])
+for linenum, s in self.get_comments(path):
+if self.is_german(s):
+# Make sure we print each filename only once
+fnames.add(path)
+# Print the filenames
+for f in fnames:
+print f
 
 def check_source_files(self, dir):
 """
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sc/source

2012-02-22 Thread Josh Heidenreich
 sc/source/filter/html/htmlexp2.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit e9d045f0f476c80060a350c08d8b253eaf41c41f
Author: Josh Heidenreich 
Date:   Thu Feb 23 13:00:15 2012 +1030

Translation of German comments in sc html filter (htmlexp2.cxx)

diff --git a/sc/source/filter/html/htmlexp2.cxx 
b/sc/source/filter/html/htmlexp2.cxx
index 4834b4a..15091d1 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -71,7 +71,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, 
SCTAB nTab,
 {
 ScHTMLGraphEntry* pE = &aGraphList[ i ];
 if ( !pE->bInCell )
-{   // nicht alle in Zellen: einige neben Tabelle
+{   // not all cells: table next to some
 bTabAlignedLeft = sal_True;
 break;
 }
@@ -198,17 +198,19 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
 void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
 const rtl::OString& rImgOptions, sal_uLong nXOutFlags )
 {
-// embeddete Grafik -> via WriteGraphic schreiben
+// Embedded graphic -> create an image file
 if( !rLinkName.Len() )
 {
 if( aStreamPath.Len() > 0 )
 {
-// Grafik als (JPG-)File speichern
+// Save as a PNG
 String aGrfNm( aStreamPath );
 nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE;
 sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
 CREATE_STRING( "PNG" ), nXOutFlags );
-if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben
+
+// If it worked, create a URL for the IMG tag
+if( !nErr )
 {
 rLinkName = URIHelper::SmartRel2Abs(
 INetURLObject(aBaseURL),
@@ -221,6 +223,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const 
Graphic& rGrf,
 }
 else
 {
+// Linked graphic - figure out the URL for the IMG tag
 if( bCopyLocalFileToINet || HasCId() )
 {
 CopyLocalFileToINet( rLinkName, aStreamPath );
@@ -233,8 +236,11 @@ void ScHTMLExport::WriteImage( String& rLinkName, const 
Graphic& rGrf,
 rLinkName,
 URIHelper::GetMaybeFileHdl());
 }
+
+// If a URL was set, output the IMG tag.
+// 
 if( rLinkName.Len() )
-{   // 
+{
 rStrm << '<' << OOO_STRING_SVTOOLS_HTML_image << ' ' << 
OOO_STRING_SVTOOLS_HTML_O_src << "=\"";
 HTMLOutFuncs::Out_String( rStrm, 
URIHelper::simpleNormalizedMakeRelative(
 aBaseURL,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: vcl/aqua vcl/source vcl/unx

2012-02-21 Thread Josh Heidenreich
 vcl/aqua/source/app/salinst.cxx|3 ---
 vcl/aqua/source/window/salmenu.cxx |2 +-
 vcl/source/app/svdata.cxx  |   14 --
 vcl/source/window/winproc.cxx  |   12 ++--
 vcl/unx/gtk/window/gtkframe.cxx|   11 ---
 5 files changed, 3 insertions(+), 39 deletions(-)

New commits:
commit 936ebcfa4b44a90bdc8789ce7556f1ba3599375c
Author: Josh Heidenreich 
Date:   Tue Feb 21 13:06:11 2012 +1030

EasyHack fdo#46258 Removal of VCL testtool support (-enableautomation 
option)

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index adae096..7a01b0b 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -206,9 +206,6 @@ static void initNSApp()
selector: 
@selector(applicationWillResignActive:)
name: @"AppleRemoteWillResignActive"
object: nil ];
-
-if( ImplGetSVData()->mbIsTestTool )
-[NSApp activateIgnoringOtherApps: YES];
 }
 
 sal_Bool ImplSVMainHook( int * pnInit )
diff --git a/vcl/aqua/source/window/salmenu.cxx 
b/vcl/aqua/source/window/salmenu.cxx
index 23d0180..f358e47 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -542,7 +542,7 @@ sal_Bool AquaSalMenu::VisibleMenuBar()
 
 static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS");
 
-if ( ImplGetSVData()->mbIsTestTool || (pExperimental && 
!strcasecmp(pExperimental, "FALSE")) )
+if ( pExperimental && !strcasecmp(pExperimental, "FALSE") )
 return sal_False;
 
 // End of experimental code enable/disable part
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 84b2df0..3cd 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -121,20 +121,6 @@ void ImplInitSVData()
 pImplSVData->maHelpData.mbAutoHelpId = sal_True;
 pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color( 
COL_TRANSPARENT );
 
-// find out whether we are running in the testtool
-// in this case we need some special workarounds
-sal_uInt32 nArgs = osl_getCommandArgCount();
-for( sal_uInt32 i = 0; i < nArgs; i++ )
-{
-rtl::OUString aArg;
-osl_getCommandArg( i, &aArg.pData );
-if( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-enableautomation" 
) ) )
-{
-pImplSVData->mbIsTestTool = true;
-break;
-}
-}
-
 // mark default layout border as unitialized
 pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
 }
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a306fa5..504b753 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1851,15 +1851,11 @@ static void ImplHandleGetFocus( Window* pWindow )
 // do not blink when they receive focus
 if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId )
 {
-bool bCallDirect = ImplGetSVData()->mbIsTestTool;
 pWindow->ImplGetWindowImpl()->mpFrameData->mbStartFocusState = 
!pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent( 
pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId, LINK( pWindow, Window, 
ImplAsyncFocusHdl ) );
+Application::PostUserEvent( 
pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId, LINK( pWindow, Window, 
ImplAsyncFocusHdl ) );
 Window* pFocusWin = 
pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
 if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor )
 pFocusWin->ImplGetWindowImpl()->mpCursor->ImplShow();
-if( bCallDirect )
-pWindow->ImplAsyncFocusHdl( NULL );
 }
 }
 
@@ -1892,19 +1888,15 @@ static void ImplHandleLoseFocus( Window* pWindow )
 
 // execute Focus-Events after a delay, such that SystemChildWindows
 // do not flicker when they receive focus
-bool bCallDirect = ImplGetSVData()->mbIsTestTool;
 if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId )
 {
 pWindow->ImplGetWindowImpl()->mpFrameData->mbStartFocusState = 
!pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent( 
pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId, LINK( pWindow, Window, 
ImplAsyncFocusHdl ) );
+Application::PostUserEvent( 
pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId, LINK( pWindow, Window, 
ImplAsyncFocusHdl ) );
 }
 
 Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
 if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor )
 pFocusWin-&g

[Libreoffice-commits] .: svx/source

2012-02-20 Thread Josh Heidenreich
 svx/source/svdraw/svdotextpathdecomposition.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 1248e2af6a70c44651b74d2950aeabb64c1c70e7
Author: Josh Heidenreich 
Date:   Tue Feb 21 09:27:38 2012 +1030

Fixed a possible NULL-dereference found by cppcheck in svx

diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx 
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 6488124..0276f05 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -361,15 +361,16 @@ namespace
 {
 const impPathTextPortion* pCandidate = rTextPortions[a];
 basegfx::B2DVector aFontScaling;
-const drawinglayer::attribute::FontAttribute 
aCandidateFontAttribute(
-drawinglayer::primitive2d::getFontAttributeFromVclFont(
-aFontScaling,
-pCandidate->getFont(),
-pCandidate->isRTL(),
-false));
 
 if(pCandidate && pCandidate->getTextLength())
 {
+const drawinglayer::attribute::FontAttribute 
aCandidateFontAttribute(
+drawinglayer::primitive2d::getFontAttributeFromVclFont(
+aFontScaling,
+pCandidate->getFont(),
+pCandidate->isRTL(),
+false));
+
 drawinglayer::primitive2d::TextLayouterDevice 
aTextLayouter;
 aTextLayouter.setFont(pCandidate->getFont());
 xub_StrLen nUsedTextLength(0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: libcdr/README libcmis/README libcroco/README libgsf/README libpng/README librsvg/README libvisio/README

2012-02-13 Thread Josh Heidenreich
 libcdr/README   |3 +++
 libcmis/README  |8 
 libcroco/README |4 
 libgsf/README   |4 
 libpng/README   |1 +
 librsvg/README  |4 
 libvisio/README |4 
 7 files changed, 28 insertions(+)

New commits:
commit b87e6be543b3daf73edb95012b87dbf95a918b95
Author: Josh Heidenreich 
Date:   Tue Feb 14 12:33:01 2012 +1030

Added READMEs for some library modules which didn't have them

diff --git a/libcdr/README b/libcdr/README
new file mode 100644
index 000..d3ba94d
--- /dev/null
+++ b/libcdr/README
@@ -0,0 +1,3 @@
+Library parsing the Corel cdr documents.
+
+I couldn't find an upstream for this library - although I did only try a 
primitive Google search.
diff --git a/libcmis/README b/libcmis/README
new file mode 100644
index 000..c39861a
--- /dev/null
+++ b/libcmis/README
@@ -0,0 +1,8 @@
+A C++ client library for the CMIS interface.
+
+From:
+[http://sourceforge.net/projects/libcmis/]
+
+Wikipedia (CMIS):
+Content Management Interoperability Services (CMIS) is an open standard that 
defines an
+abstraction layer for controlling diverse document management systems and 
repositories using web protocols.
diff --git a/libcroco/README b/libcroco/README
new file mode 100644
index 000..52a93c6
--- /dev/null
+++ b/libcroco/README
@@ -0,0 +1,4 @@
+A general CSS parsing and manipulation library written in C for the GNOME 
project.
+
+From:
+[https://launchpad.net/libcroco]
diff --git a/libgsf/README b/libgsf/README
new file mode 100644
index 000..821cd52
--- /dev/null
+++ b/libgsf/README
@@ -0,0 +1,4 @@
+A simple i/o library that can read and write common file types and handle 
structured formats that provide file-system-in-a-file semantics.
+
+From:
+[http://www.gnome.org/projects/libgsf]
diff --git a/libpng/README b/libpng/README
new file mode 100644
index 000..8b9c896
--- /dev/null
+++ b/libpng/README
@@ -0,0 +1 @@
+libpng is the official PNG reference library, from [http://www.libpng.org/]
diff --git a/librsvg/README b/librsvg/README
new file mode 100644
index 000..6b8b641
--- /dev/null
+++ b/librsvg/README
@@ -0,0 +1,4 @@
+Rapid Rendering of SVG files to screen or to other more conventional 
filetypes, such as JPEG and PNG.
+
+From:
+[http://librsvg.sourceforge.net/]
diff --git a/libvisio/README b/libvisio/README
new file mode 100644
index 000..216fee9
--- /dev/null
+++ b/libvisio/README
@@ -0,0 +1,4 @@
+Libvisio is library providing ability to interpret and import visio diagrams 
into various applications.
+
+See also:
+[http://www.freedesktop.org/wiki/Software/libvisio]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits